pgsql-deparser 13.3.14 → 13.4.0

package/main/deparser.js

@@ -1,52 +1,29 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _util = require("util");
-
 var _pgsqlEnums = require("pgsql-enums");
-
-var _preparse = require("./preparse");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 var TAB_CHAR = '\t';
 var NEWLINE_CHAR = '\n';
-
 var isEmptyObject = function isEmptyObject(obj) {
   return !obj || (0, _typeof2["default"])(obj) === 'object' && !Object.keys(obj).length;
 };
-
 var dotty = require('dotty');
-
 var fail = function fail(type, node) {
   throw new Error((0, _util.format)('Unhandled %s node: %s', type, JSON.stringify(node)));
-}; // select word from pg_get_keywords() where catcode = 'R';
-
+};
 
-var RESERVED_WORDS = ['all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both', 'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog', 'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially', 'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp', 'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary', 'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic', 'when', 'where', 'window', 'with']; // https://github.com/pganalyze/libpg_query/blob/b2790f8140721ff7f047167ecd7d44267b0a3880/src/postgres/include/storage/lockdefs.h
+// select word from pg_get_keywords() where catcode = 'R';
+var RESERVED_WORDS = new Set(['all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both', 'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog', 'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially', 'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp', 'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary', 'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic', 'when', 'where', 'window', 'with']);
 
+// https://github.com/pganalyze/libpg_query/blob/b2790f8140721ff7f047167ecd7d44267b0a3880/src/postgres/include/storage/lockdefs.h
 var LOCK_MODES = {
   1: 'ACCESS SHARE',
   2: 'ROW SHARE',
@@ -57,60 +34,73 @@ var LOCK_MODES = {
   7: 'EXCLUSIVE',
   8: 'ACCESS EXCLUSIVE'
 };
-
 var isReserved = function isReserved(value) {
-  return RESERVED_WORDS.includes(value.toLowerCase());
-}; // usually the AST lowercases all the things, so if we
-// have both, the author most likely used double quotes
+  return RESERVED_WORDS.has(value.toLowerCase());
+};
 
+// has uppercase and lowercase, or non word characters
+var needsQuotesRegex = /[a-z]+[\W\w]*[A-Z]+|[A-Z]+[\W\w]*[a-z]+|\W/;
 
+// usually the AST lowercases all the things, so if we
+// have both, the author most likely used double quotes
 var needsQuotes = function needsQuotes(value) {
-  return value.match(/[a-z]+[\W\w]*[A-Z]+|[A-Z]+[\W\w]*[a-z]+/) || value.match(/\W/) || isReserved(value);
+  return needsQuotesRegex.test(value) || isReserved(value);
 };
-
-var keys = _lodash["default"].keys;
-
 var compact = function compact(o) {
-  return _lodash["default"].filter(_lodash["default"].compact(o), function (p) {
-    if (p == null) {
-      return false;
-    }
-
-    return p.toString().length;
+  return o.filter(function (e) {
+    var isFalsy = !e;
+    return !isFalsy && e.toString().length;
   });
 };
-
+var flatten = function flatten(o) {
+  var flattened = [];
+  for (var i = 0; i < o.length; i++) {
+    if (Array.isArray(o[i])) {
+      for (var j = 0; j < o[i].length; j++) {
+        flattened.push(o[i][j]);
+      }
+    } else {
+      flattened.push(o[i]);
+    }
+  }
+  return flattened;
+};
+var inverted = function inverted(o) {
+  var objInverted = {};
+  var keys = Object.keys(o);
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    objInverted[o[key]] = key;
+  }
+  return objInverted;
+};
 var parens = function parens(string) {
   return '(' + string + ')';
 };
-
 var indent = function indent(text) {
   var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
   return text;
 };
-
+var unwrapList = function unwrapList(obj) {
+  return obj !== undefined && obj.List !== undefined ? obj.List.items : obj;
+};
 var Deparser = /*#__PURE__*/function () {
   function Deparser(tree) {
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     (0, _classCallCheck2["default"])(this, Deparser);
-    this.tree = (0, _preparse.preparse)(tree);
-
+    this.tree = tree;
     if (opts.hasOwnProperty('newline')) {
       NEWLINE_CHAR = opts.newline;
     }
-
     if (opts.hasOwnProperty('tab')) {
       TAB_CHAR = opts.tab;
     }
-
-    if (!_lodash["default"].isArray(this.tree)) this.tree = [this.tree];
+    if (!Array.isArray(this.tree)) this.tree = [this.tree];
   }
-
   (0, _createClass2["default"])(Deparser, [{
     key: "deparseQuery",
     value: function deparseQuery() {
       var _this = this;
-
       return this.tree.map(function (node) {
         return _this.deparse(node);
       }).join(NEWLINE_CHAR + NEWLINE_CHAR);
@@ -119,17 +109,16 @@ var Deparser = /*#__PURE__*/function () {
     key: "deparseNodes",
     value: function deparseNodes(nodes, context) {
       var _this2 = this;
-
-      return nodes.map(function (node) {
-        return _lodash["default"].isArray(node) ? _this2.list(node, ', ', '', context) : _this2.deparse(node, context);
+      return unwrapList(nodes).map(function (node) {
+        var unwrapped = unwrapList(node);
+        return Array.isArray(unwrapped) ? _this2.list(unwrapped, ', ', '', context) : _this2.deparse(node, context);
       });
     }
   }, {
     key: "deparseReturningList",
     value: function deparseReturningList(list, context) {
       var _this3 = this;
-
-      return list.map(function (returning) {
+      return unwrapList(list).map(function (returning) {
         return _this3.deparse(returning.ResTarget.val, context) + (returning.ResTarget.name ? ' AS ' + _this3.quote(returning.ResTarget.name) : '');
       }).join(',');
     }
@@ -139,11 +128,9 @@ var Deparser = /*#__PURE__*/function () {
       var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ', ';
       var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
       var context = arguments.length > 3 ? arguments[3] : undefined;
-
       if (!nodes) {
         return '';
       }
-
       return this.deparseNodes(nodes, context).map(function (l) {
         return "".concat(prefix).concat(l);
       }).join(separator);
@@ -152,9 +139,8 @@ var Deparser = /*#__PURE__*/function () {
     key: "listQuotes",
     value: function listQuotes(nodes) {
       var _this4 = this;
-
       var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ', ';
-      return this.list(nodes, separator).split(separator).map(function (a) {
+      return this.list(unwrapList(nodes), separator).split(separator).map(function (a) {
         return _this4.quote(a.trim());
       }).join(separator);
     }
@@ -162,24 +148,22 @@ var Deparser = /*#__PURE__*/function () {
     key: "quote",
     value: function quote(value) {
       var _this5 = this;
-
       if (value == null) {
         return null;
       }
-
-      if (_lodash["default"].isArray(value)) {
-        return value.map(function (o) {
+      var unwrapped = unwrapList(value);
+      if (Array.isArray(unwrapped)) {
+        return unwrapped.map(function (o) {
           return _this5.quote(o);
         });
       }
-
       if (needsQuotes(value)) {
         return '"' + value + '"';
       }
-
       return value;
-    } // SELECT encode(E'''123\\000\\001', 'base64')
+    }
 
+    // SELECT encode(E'''123\\000\\001', 'base64')
   }, {
     key: "escape",
     value: function escape(literal) {
@@ -192,45 +176,32 @@ var Deparser = /*#__PURE__*/function () {
         case 'bpchar':
           if (size != null) {
             return 'char';
-          } // return `pg_catalog.bpchar` below so that the following is symmetric
+          }
+          // return `pg_catalog.bpchar` below so that the following is symmetric
           // SELECT char 'c' = char 'c' AS true
-
-
           return 'pg_catalog.bpchar';
-
         case 'varchar':
           return 'varchar';
-
         case 'numeric':
           return 'numeric';
-
         case 'bool':
           return 'boolean';
-
         case 'int2':
           return 'smallint';
-
         case 'int4':
           return 'int';
-
         case 'int8':
           return 'bigint';
-
         case 'real':
           return 'pg_catalog.float4';
-
         case 'time':
           return 'time';
-
         case 'timestamp':
           return 'timestamp';
-
         case 'interval':
           return 'interval';
-
         case 'bit':
           return 'bit';
-
         default:
           return 'pg_catalog.' + typeName;
       }
@@ -239,35 +210,28 @@ var Deparser = /*#__PURE__*/function () {
     key: "type",
     value: function type(names, args) {
       var _this6 = this;
-
-      var _names$map = names.map(function (name) {
+      var catalogAndType = unwrapList(names).map(function (name) {
         return _this6.deparse(name);
-      }),
-          _names$map2 = (0, _slicedToArray2["default"])(_names$map, 2),
-          catalog = _names$map2[0],
-          type = _names$map2[1];
-
+      });
+      var catalog = catalogAndType[0];
+      var type = catalogAndType[1];
       var mods = function mods(name, size) {
         if (size != null) {
           return name + '(' + size + ')';
         }
-
         return name;
-      }; // handle the special "char" (in quotes) type
-
+      };
 
+      // handle the special "char" (in quotes) type
       if (catalog === 'char' && !type) {
         return mods('"char"', args);
       }
-
       if (catalog === 'pg_catalog' && type === 'char') {
         return mods('pg_catalog."char"', args);
       }
-
       if (catalog !== 'pg_catalog') {
         return mods(this.listQuotes(names, '.'), args);
       }
-
       var res = this.getPgCatalogTypeName(type, args);
       return mods(res, args);
     }
@@ -277,30 +241,23 @@ var Deparser = /*#__PURE__*/function () {
       if (item == null) {
         return null;
       }
-
-      if (_lodash["default"].isNumber(item)) {
+      if (typeof item === 'number' || item instanceof Number) {
         return item;
       }
-
-      var type = keys(item)[0];
-
-      var node = _lodash["default"].values(item)[0];
-
+      var type = Object.keys(item)[0];
+      var node = item[type];
       if (this[type] == null) {
         throw new Error(type + ' is not implemented: ' + JSON.stringify(node));
       }
-
       return this[type](node, context);
     }
   }, {
     key: 'RawStmt',
     value: function RawStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (node.stmt_len) {
         return this.deparse(node.stmt, context) + ';';
       }
-
       return this.deparse(node.stmt, context);
     }
   }, {
@@ -310,59 +267,47 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push('CREATE');
       output.push('RULE');
-
       if (node.rulename === '_RETURN') {
         // special rules
         output.push('"_RETURN"');
       } else {
         output.push(node.rulename);
       }
-
       output.push('AS');
       output.push('ON');
-
       switch (node.event) {
         case 'CMD_SELECT':
           output.push('SELECT');
           break;
-
         case 'CMD_UPDATE':
           output.push('UPDATE');
           break;
-
         case 'CMD_INSERT':
           output.push('INSERT');
           break;
-
         case 'CMD_DELETE':
           output.push('DELETE');
           break;
-
         default:
           throw new Error('event type not yet implemented for RuleStmt');
       }
-
       output.push('TO');
       output.push(this.RangeVar(node.relation, context));
-
       if (node.whereClause) {
         output.push('WHERE');
         output.push(this.deparse(node.whereClause, context));
       }
-
       output.push('DO');
-
       if (node.instead) {
         output.push('INSTEAD');
       }
-
-      if (!node.actions || !node.actions.length) {
+      var actions = unwrapList(node.actions);
+      if (!actions || !actions.length) {
         output.push('NOTHING');
       } else {
         // TODO how do multiple actions happen?
-        output.push(this.deparse(node.actions[0], context));
+        output.push(this.deparse(actions[0], context));
       }
-
       return output.join(' ');
     }
   }, {
@@ -370,152 +315,126 @@ var Deparser = /*#__PURE__*/function () {
     value: function A_Expr(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
+      var nodeName = unwrapList(node.name);
       switch (node.kind) {
         case 'AEXPR_OP':
           {
             var operator;
-
             if (node.lexpr) {
               // PARENS
-              if (dotty.exists(node, 'lexpr.A_Expr')) {
+              if (node.lexpr !== undefined && node.lexpr.A_Expr !== undefined) {
                 output.push(parens(this.deparse(node.lexpr, context)));
               } else {
                 output.push(this.deparse(node.lexpr, context));
               }
             }
-
-            if (node.name.length > 1) {
-              var schema = this.deparse(node.name[0], context);
-              operator = this.deparse(node.name[1], context);
+            if (nodeName.length > 1) {
+              var schema = this.deparse(nodeName[0], context);
+              operator = this.deparse(nodeName[1], context);
               output.push("OPERATOR(".concat(schema, ".").concat(operator, ")"));
             } else {
-              operator = this.deparse(node.name[0], context);
+              operator = this.deparse(nodeName[0], context);
               output.push(operator);
             }
-
             if (node.rexpr) {
               // PARENS
-              if (dotty.exists(node, 'rexpr.A_Expr')) {
+              if (node.rexpr !== undefined && node.rexpr.A_Expr !== undefined) {
                 output.push(parens(this.deparse(node.rexpr, context)));
               } else {
                 output.push(this.deparse(node.rexpr, context));
               }
             }
-
             if (output.length === 2) {
               return output.join('');
             }
-
             if (['->', '->>'].includes(operator)) {
               return output.join('');
             }
-
             return output.join(' ');
           }
-
         case 'AEXPR_OP_ANY':
           /* scalar op ANY (array) */
           output.push(this.deparse(node.lexpr, context));
           output.push((0, _util.format)('ANY (%s)', this.deparse(node.rexpr, context)));
-          return output.join(" ".concat(this.deparse(node.name[0], context), " "));
-
+          return output.join(" ".concat(this.deparse(nodeName[0], context), " "));
         case 'AEXPR_OP_ALL':
           /* scalar op ALL (array) */
           output.push(this.deparse(node.lexpr, context));
           output.push((0, _util.format)('ALL (%s)', this.deparse(node.rexpr, context)));
-          return output.join(" ".concat(this.deparse(node.name[0], context), " "));
-
+          return output.join(" ".concat(this.deparse(nodeName[0], context), " "));
         case 'AEXPR_DISTINCT':
           /* IS DISTINCT FROM - name must be "=" */
           return (0, _util.format)('%s IS DISTINCT FROM %s', this.deparse(node.lexpr, context), this.deparse(node.rexpr, context));
-
         case 'AEXPR_NOT_DISTINCT':
           /* IS NOT DISTINCT FROM - name must be "=" */
           return (0, _util.format)('%s IS NOT DISTINCT FROM %s', this.deparse(node.lexpr, context), this.deparse(node.rexpr, context));
-
         case 'AEXPR_NULLIF':
           /* NULLIF - name must be "=" */
           return (0, _util.format)('NULLIF(%s, %s)', this.deparse(node.lexpr, context), this.deparse(node.rexpr, context));
-
         case 'AEXPR_OF':
           {
             /* IS [NOT] OF - name must be "=" or "<>" */
-            var op = node.name[0].String.str === '=' ? 'IS OF' : 'IS NOT OF';
+            var op = nodeName[0].String.str === '=' ? 'IS OF' : 'IS NOT OF';
             return (0, _util.format)('%s %s (%s)', this.deparse(node.lexpr, context), op, this.list(node.rexpr, ', ', '', context));
           }
-
         case 'AEXPR_IN':
           {
             /* [NOT] IN - name must be "=" or "<>" */
-            var _operator = node.name[0].String.str === '=' ? 'IN' : 'NOT IN';
-
+            var _operator = nodeName[0].String.str === '=' ? 'IN' : 'NOT IN';
             return (0, _util.format)('%s %s (%s)', this.deparse(node.lexpr, context), _operator, this.list(node.rexpr, ', ', '', context));
           }
-
         case 'AEXPR_LIKE':
           /* [NOT] LIKE - name must be "~~" or "!~~" */
           output.push(this.deparse(node.lexpr, context));
-
-          if (node.name[0].String.str === '!~~') {
+          if (nodeName[0].String.str === '!~~') {
             output.push((0, _util.format)('NOT LIKE (%s)', this.deparse(node.rexpr, context)));
           } else {
             output.push((0, _util.format)('LIKE (%s)', this.deparse(node.rexpr, context)));
           }
-
           return output.join(' ');
-
         case 'AEXPR_ILIKE':
           /* [NOT] ILIKE - name must be "~~*" or "!~~*" */
           output.push(this.deparse(node.lexpr, context));
-
-          if (node.name[0].String.str === '!~~*') {
+          if (nodeName[0].String.str === '!~~*') {
             output.push((0, _util.format)('NOT ILIKE (%s)', this.deparse(node.rexpr, context)));
           } else {
             output.push((0, _util.format)('ILIKE (%s)', this.deparse(node.rexpr, context)));
           }
-
           return output.join(' ');
-
         case 'AEXPR_SIMILAR':
           // SIMILAR TO emits a similar_escape FuncCall node with the first argument
           output.push(this.deparse(node.lexpr, context));
-
-          if (node.name[0].String.str === '~') {
-            if (node.rexpr.FuncCall.args.length > 1) {
-              output.push((0, _util.format)('SIMILAR TO %s ESCAPE %s', this.deparse(node.rexpr.FuncCall.args[0], context), this.deparse(node.rexpr.FuncCall.args[1], context)));
+          if (nodeName[0].String.str === '~') {
+            if (unwrapList(node.rexpr.FuncCall.args).length > 1) {
+              output.push((0, _util.format)('SIMILAR TO %s ESCAPE %s', this.deparse(unwrapList(node.rexpr.FuncCall.args)[0], context), this.deparse(unwrapList(node.rexpr.FuncCall.args)[1], context)));
             } else {
-              output.push((0, _util.format)('SIMILAR TO %s', this.deparse(node.rexpr.FuncCall.args[0], context)));
+              output.push((0, _util.format)('SIMILAR TO %s', this.deparse(unwrapList(node.rexpr.FuncCall.args)[0], context)));
             }
           } else {
-            if (node.rexpr.FuncCall.args.length > 1) {
-              output.push((0, _util.format)('NOT SIMILAR TO %s ESCAPE %s', this.deparse(node.rexpr.FuncCall.args[0], context), this.deparse(node.rexpr.FuncCall.args[1], context)));
+            if (unwrapList(node.rexpr.FuncCall.args).length > 1) {
+              output.push((0, _util.format)('NOT SIMILAR TO %s ESCAPE %s', this.deparse(unwrapList(node.rexpr.FuncCall.args)[0], context), this.deparse(unwrapList(node.rexpr.FuncCall.args)[1], context)));
             } else {
-              output.push((0, _util.format)('NOT SIMILAR TO %s', this.deparse(node.rexpr.FuncCall.args[0], context)));
+              output.push((0, _util.format)('NOT SIMILAR TO %s', this.deparse(unwrapList(node.rexpr.FuncCall.args)[0], context)));
             }
           }
-
           return output.join(' ');
-
         case 'AEXPR_BETWEEN':
           output.push(this.deparse(node.lexpr, context));
-          output.push((0, _util.format)('BETWEEN %s AND %s', this.deparse(node.rexpr[0], context), this.deparse(node.rexpr[1], context)));
+          output.push((0, _util.format)('BETWEEN %s AND %s', this.deparse(unwrapList(node.rexpr)[0], context), this.deparse(unwrapList(node.rexpr)[1], context)));
           return output.join(' ');
-
         case 'AEXPR_NOT_BETWEEN':
           output.push(this.deparse(node.lexpr, context));
-          output.push((0, _util.format)('NOT BETWEEN %s AND %s', this.deparse(node.rexpr[0], context), this.deparse(node.rexpr[1], context)));
+          output.push((0, _util.format)('NOT BETWEEN %s AND %s', this.deparse(unwrapList(node.rexpr)[0], context), this.deparse(unwrapList(node.rexpr)[1], context)));
           return output.join(' ');
-
         case 'AEXPR_BETWEEN_SYM':
           output.push(this.deparse(node.lexpr, context));
-          output.push((0, _util.format)('BETWEEN SYMMETRIC %s AND %s', this.deparse(node.rexpr[0], context), this.deparse(node.rexpr[1], context)));
+          output.push((0, _util.format)('BETWEEN SYMMETRIC %s AND %s', this.deparse(unwrapList(node.rexpr)[0], context), this.deparse(unwrapList(node.rexpr)[1], context)));
           return output.join(' ');
-
         case 'AEXPR_NOT_BETWEEN_SYM':
           output.push(this.deparse(node.lexpr, context));
-          output.push((0, _util.format)('NOT BETWEEN SYMMETRIC %s AND %s', this.deparse(node.rexpr[0], context), this.deparse(node.rexpr[1], context)));
+          output.push((0, _util.format)('NOT BETWEEN SYMMETRIC %s AND %s', this.deparse(unwrapList(node.rexpr)[0], context), this.deparse(unwrapList(node.rexpr)[1], context)));
           return output.join(' ');
+
         // case 15:
         // AEXPR_PAREN
 
@@ -529,13 +448,11 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var name = node.aliasname;
       var output = ['AS'];
-
       if (node.colnames) {
         output.push(this.quote(name) + parens(this.listQuotes(node.colnames)));
       } else {
         output.push(this.quote(name));
       }
-
       return output.join(' ');
     }
   }, {
@@ -547,38 +464,36 @@ var Deparser = /*#__PURE__*/function () {
     key: 'A_Const',
     value: function A_Const(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (node.val.String) {
         return this.escape(this.deparse(node.val, context));
       }
-
       return this.deparse(node.val, context);
     }
   }, {
     key: 'A_Indices',
     value: function A_Indices(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (node.lidx) {
         return (0, _util.format)('[%s:%s]', this.deparse(node.lidx, context), this.deparse(node.uidx, context));
       }
-
       return (0, _util.format)('[%s]', this.deparse(node.uidx, context));
     }
   }, {
     key: 'A_Indirection',
     value: function A_Indirection(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var output = ["(".concat(this.deparse(node.arg, context), ")")]; // TODO(zhm) figure out the actual rules for when a '.' is needed
+      var output = ["(".concat(this.deparse(node.arg, context), ")")];
+
+      // TODO(zhm) figure out the actual rules for when a '.' is needed
       //
       // select a.b[0] from a;
       // select (select row(1)).*
       // select c2[2].f2 from comptable
       // select c2.a[2].f2[1].f3[0].a1 from comptable
 
-      for (var i = 0; i < node.indirection.length; i++) {
-        var subnode = node.indirection[i];
-
+      var indirection = unwrapList(node.indirection);
+      for (var i = 0; i < indirection.length; i++) {
+        var subnode = indirection[i];
         if (subnode.String || subnode.A_Star) {
           var value = subnode.A_Star ? '*' : this.quote(subnode.String.str);
           output.push(".".concat(value));
@@ -586,7 +501,6 @@ var Deparser = /*#__PURE__*/function () {
           output.push(this.deparse(subnode, context));
         }
       }
-
       return output.join('');
     }
   }, {
@@ -605,25 +519,18 @@ var Deparser = /*#__PURE__*/function () {
     value: function BoolExpr(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var fmt_str = '%s';
-
       if (context.bool) {
         fmt_str = '(%s)';
       }
-
-      var ctx = _objectSpread({}, context);
-
+      var ctx = Object.assign({}, context);
       ctx.bool = true;
-
       switch (node.boolop) {
         case 'AND_EXPR':
           return (0, _util.format)(fmt_str, this.list(node.args, ' AND ', '', ctx));
-
         case 'OR_EXPR':
           return (0, _util.format)(fmt_str, this.list(node.args, ' OR ', '', ctx));
-
         case 'NOT_EXPR':
-          return (0, _util.format)('NOT (%s)', this.deparse(node.args[0], context));
-
+          return (0, _util.format)('NOT (%s)', this.deparse(unwrapList(node.args)[0], context));
         default:
           return fail('BoolExpr', node);
       }
@@ -633,38 +540,29 @@ var Deparser = /*#__PURE__*/function () {
     value: function BooleanTest(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
-      var ctx = _objectSpread({}, context);
-
+      var ctx = Object.assign({}, context);
       ctx.bool = true;
       output.push(this.deparse(node.arg, ctx));
-
       switch (node.booltesttype) {
         case 'IS_TRUE':
           output.push('IS TRUE');
           break;
-
         case 'IS_NOT_TRUE':
           output.push('IS NOT TRUE');
           break;
-
         case 'IS_FALSE':
           output.push('IS FALSE');
           break;
-
         case 'IS_NOT_FALSE':
           output.push('IS NOT FALSE');
           break;
-
         case 'IS_UNKNOWN':
           output.push('IS UNKNOWN');
           break;
-
         case 'IS_NOT_UNKNOWN':
           output.push('IS NOT UNKNOWN');
           break;
       }
-
       return output.join(' ');
     }
   }, {
@@ -672,20 +570,17 @@ var Deparser = /*#__PURE__*/function () {
     value: function CaseExpr(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = ['CASE'];
-
       if (node.arg) {
         output.push(this.deparse(node.arg, context));
       }
-
-      for (var i = 0; i < node.args.length; i++) {
-        output.push(this.deparse(node.args[i], context));
+      var args = unwrapList(node.args);
+      for (var i = 0; i < args.length; i++) {
+        output.push(this.deparse(args[i], context));
       }
-
       if (node.defresult) {
         output.push('ELSE');
         output.push(this.deparse(node.defresult, context));
       }
-
       output.push('END');
       return output.join(' ');
     }
@@ -700,17 +595,13 @@ var Deparser = /*#__PURE__*/function () {
     value: function CollateClause(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.arg) {
         output.push(this.deparse(node.arg, context));
       }
-
       output.push('COLLATE');
-
       if (node.collname) {
         output.push(this.quote(this.deparseNodes(node.collname, context)));
       }
-
       return output.join(' ');
     }
   }, {
@@ -731,15 +622,12 @@ var Deparser = /*#__PURE__*/function () {
     value: function RenameStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.renameType === 'OBJECT_FUNCTION' || node.renameType === 'OBJECT_FOREIGN_TABLE' || node.renameType === 'OBJECT_FDW' || node.renameType === 'OBJECT_FOREIGN_SERVER') {
         output.push('ALTER');
         output.push((0, _pgsqlEnums.objtypeName)(node.renameType));
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         output.push(this.deparse(node.object, context));
         output.push('RENAME');
         output.push('TO');
@@ -747,11 +635,9 @@ var Deparser = /*#__PURE__*/function () {
       } else if (node.renameType === 'OBJECT_ATTRIBUTE') {
         output.push('ALTER');
         output.push((0, _pgsqlEnums.objtypeName)(node.relationType));
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         output.push(this.RangeVar(node.relation, context));
         output.push('RENAME');
         output.push((0, _pgsqlEnums.objtypeName)(node.renameType));
@@ -761,11 +647,9 @@ var Deparser = /*#__PURE__*/function () {
       } else if (node.renameType === 'OBJECT_DOMAIN' || node.renameType === 'OBJECT_TYPE') {
         output.push('ALTER');
         output.push((0, _pgsqlEnums.objtypeName)(node.renameType));
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         var typObj = {
           TypeName: {
             names: node.object
@@ -778,11 +662,9 @@ var Deparser = /*#__PURE__*/function () {
       } else if (node.renameType === 'OBJECT_SCHEMA') {
         output.push('ALTER');
         output.push((0, _pgsqlEnums.objtypeName)(node.renameType));
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         output.push(this.quote(node.subname));
         output.push('RENAME');
         output.push('TO');
@@ -790,11 +672,9 @@ var Deparser = /*#__PURE__*/function () {
       } else if (node.renameType === 'OBJECT_DOMCONSTRAINT') {
         output.push('ALTER');
         output.push('DOMAIN');
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         var _typObj = {
           TypeName: {
             names: node.object
@@ -808,22 +688,18 @@ var Deparser = /*#__PURE__*/function () {
       } else {
         output.push('ALTER');
         output.push('TABLE');
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         output.push(this.RangeVar(node.relation, context));
         output.push('RENAME');
         output.push(this.quote(node.subname));
         output.push('TO');
         output.push(this.quote(node.newname));
       }
-
       if (node.behavior === 'DROP_CASCADE') {
         output.push('CASCADE');
       }
-
       return output.join(' ');
     }
   }, {
@@ -833,13 +709,12 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push('ALTER');
       output.push((0, _pgsqlEnums.objtypeName)(node.objectType));
-
-      if (Array.isArray(node.object)) {
-        output.push(this.listQuotes(node.object, '.'));
+      var unwrapped = unwrapList(node.object);
+      if (Array.isArray(unwrapped)) {
+        output.push(this.listQuotes(unwrapped, '.'));
       } else {
         output.push(this.deparse(node.object, context));
       }
-
       output.push('OWNER TO');
       output.push(this.RoleSpec(node.newowner, context));
       return output.join(' ');
@@ -849,36 +724,30 @@ var Deparser = /*#__PURE__*/function () {
     value: function AlterObjectSchemaStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.objectType === 'OBJECT_TABLE') {
         output.push('ALTER');
         output.push((0, _pgsqlEnums.objtypeName)(node.objectType));
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         output.push(this.RangeVar(node.relation, context));
         output.push('SET SCHEMA');
         output.push(this.quote(node.newschema));
       } else {
         output.push('ALTER');
         output.push((0, _pgsqlEnums.objtypeName)(node.objectType));
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
-        if (Array.isArray(node.object)) {
-          output.push(this.listQuotes(node.object, '.'));
+        var unwrapped = unwrapList(node.object);
+        if (Array.isArray(unwrapped)) {
+          output.push(this.listQuotes(unwrapped, '.'));
         } else {
           output.push(this.deparse(node.object, context));
         }
-
         output.push('SET SCHEMA');
         output.push(this.quote(node.newschema));
       }
-
       return output.join(' ');
     }
   }, {
@@ -887,23 +756,19 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [this.quote(node.colname)];
       output.push(this.TypeName(node.typeName, context));
-
       if (node.raw_default) {
         output.push('USING');
         output.push(this.deparse(node.raw_default, context));
       }
-
       if (node.constraints) {
         output.push(this.list(node.constraints, ' ', '', context));
       }
-
       if (node.collClause) {
         output.push('COLLATE');
-        var str = dotty.get(node, 'collClause.collname.0.String.str');
+        var str = unwrapList(node.collClause.collname)[0].String.str;
         output.push(this.quote(str));
       }
-
-      return _lodash["default"].compact(output).join(' ');
+      return compact(output).join(' ');
     }
   }, {
     key: 'SQLValueFunction',
@@ -911,39 +776,31 @@ var Deparser = /*#__PURE__*/function () {
       if (node.op === 'SVFOP_CURRENT_DATE') {
         return 'CURRENT_DATE';
       }
-
       if (node.op === 'SVFOP_CURRENT_TIMESTAMP') {
         return 'CURRENT_TIMESTAMP';
       }
-
       if (node.op === 'SVFOP_CURRENT_USER') {
         return 'CURRENT_USER';
       }
-
       if (node.op === 'SVFOP_SESSION_USER') {
         return 'SESSION_USER';
       }
-
       throw new Error("op=".concat(node.op, " SQLValueFunction not implemented"));
     }
   }, {
     key: 'ColumnRef',
     value: function ColumnRef(node) {
       var _this7 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var KEYWORDS = ['old', 'new'];
-      var fields = node.fields.map(function (field) {
+      var fields = unwrapList(node.fields).map(function (field) {
         if (field.String) {
           var value = _this7.deparse(field, context);
-
           if (context === 'trigger' && KEYWORDS.includes(value.toLowerCase())) {
             return value.toUpperCase();
           }
-
           return _this7.quote(value);
         }
-
         return _this7.deparse(field, context);
       });
       return fields.join('.');
@@ -956,75 +813,71 @@ var Deparser = /*#__PURE__*/function () {
       output.push('COMMENT');
       output.push('ON');
       output.push((0, _pgsqlEnums.objtypeName)(node.objtype));
-
+      var object = unwrapList(node.object);
       if (node.objtype === 'OBJECT_CAST') {
         output.push('(');
-        output.push(this.deparse(node.object[0], context));
+        output.push(this.deparse(object[0], context));
         output.push('AS');
-        output.push(this.deparse(node.object[1], context));
+        output.push(this.deparse(object[1], context));
         output.push(')');
       } else if (node.objtype === 'OBJECT_DOMCONSTRAINT') {
-        output.push(this.deparse(node.object[1], context));
+        output.push(this.deparse(object[1], context));
         output.push('ON');
         output.push('DOMAIN');
-        output.push(this.deparse(node.object[0], context));
+        output.push(this.deparse(object[0], context));
       } else if (node.objtype === 'OBJECT_OPCLASS' || node.objtype === 'OBJECT_OPFAMILY') {
-        output.push(this.deparse(node.object[1], context));
+        output.push(this.deparse(object[1], context));
         output.push('USING');
-        output.push(this.deparse(node.object[0], context));
+        output.push(this.deparse(object[0], context));
       } else if (node.objtype === 'OBJECT_OPERATOR') {
-        output.push(this.deparse(node.object, 'noquotes'));
+        output.push(this.deparse(object, 'noquotes'));
       } else if (node.objtype === 'OBJECT_POLICY') {
-        output.push(this.deparse(node.object[1], context));
+        output.push(this.deparse(object[1], context));
         output.push('ON');
-        output.push(this.deparse(node.object[0], context));
+        output.push(this.deparse(object[0], context));
       } else if (node.objtype === 'OBJECT_ROLE') {
-        output.push(this.deparse(node.object, context));
+        output.push(this.deparse(object, context));
       } else if (node.objtype === 'OBJECT_RULE') {
-        output.push(this.deparse(node.object[1], context));
+        output.push(this.deparse(object[1], context));
         output.push('ON');
-        output.push(this.deparse(node.object[0], context));
+        output.push(this.deparse(object[0], context));
       } else if (node.objtype === 'OBJECT_TABCONSTRAINT') {
-        if (node.object.length === 3) {
-          output.push(this.deparse(node.object[2], context));
+        if (object.length === 3) {
+          output.push(this.deparse(object[2], context));
           output.push('ON');
-          output.push(this.deparse(node.object[0], context) + '.' + this.deparse(node.object[1], context));
+          output.push(this.deparse(object[0], context) + '.' + this.deparse(object[1], context));
         } else {
-          output.push(this.deparse(node.object[1], context));
+          output.push(this.deparse(object[1], context));
           output.push('ON');
-          output.push(this.deparse(node.object[0], context));
+          output.push(this.deparse(object[0], context));
         }
       } else if (node.objtype === 'OBJECT_TRANSFORM') {
         output.push('FOR');
-        output.push(this.deparse(node.object[0], context));
+        output.push(this.deparse(object[0], context));
         output.push('LANGUAGE');
-        output.push(this.deparse(node.object[1], context));
+        output.push(this.deparse(object[1], context));
       } else if (node.objtype === 'OBJECT_TRIGGER') {
-        output.push(this.deparse(node.object[1], context));
+        output.push(this.deparse(object[1], context));
         output.push('ON');
-        output.push(this.deparse(node.object[0], context));
+        output.push(this.deparse(object[0], context));
       } else {
         if (node.objtype === 'OBJECT_LARGEOBJECT') {
           output.push(dotty.get(node, 'object.Integer.ival'));
-        } else if (node.object instanceof Array) {
-          output.push(this.listQuotes(node.object, '.'));
+        } else if (object instanceof Array) {
+          output.push(this.listQuotes(object, '.'));
         } else {
-          output.push(this.deparse(node.object, context));
+          output.push(this.deparse(object, context));
         }
-
         if (node.objargs) {
           output.push('(');
           output.push(this.list(node.objargs, ', ', '', context));
           output.push(')');
         }
       }
-
       output.push('IS');
-
       var escapeComment = function escapeComment(str) {
         return str.replace(/\\/g, '\\');
       };
-
       if (node.comment) {
         if (/[^a-zA-Z0-9]/.test(node.comment)) {
           // special chars we care about...
@@ -1036,7 +889,6 @@ var Deparser = /*#__PURE__*/function () {
       } else {
         output.push('NULL');
       }
-
       return output.join(' ');
     }
   }, {
@@ -1045,20 +897,16 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push(node.ctename);
-
       if (node.aliascolnames) {
         var colnames = this.quote(this.deparseNodes(node.aliascolnames, context));
         output.push("(".concat(colnames.join(', '), ")"));
       }
-
       output.push('AS');
-
       if (node.ctematerialized === 'CTEMaterializeAlways') {
         output.push('MATERIALIZED');
       } else if (node.ctematerialized === 'CTEMaterializeNever') {
         output.push('NOT MATERIALIZED');
       }
-
       output.push((0, _util.format)('(%s)', this.deparse(node.ctequery)));
       return output.join(' ');
     }
@@ -1068,63 +916,49 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('CREATE');
-
       if (node.replace) {
         output.push('OR REPLACE');
       }
-
       switch (node.kind) {
         case 'OBJECT_AGGREGATE':
           output.push('AGGREGATE');
           break;
-
         case 'OBJECT_OPERATOR':
           output.push('OPERATOR');
           break;
-
         case 'OBJECT_TYPE':
           output.push('TYPE');
           break;
-
         case 'OBJECT_TSPARSER':
           output.push('TEXT SEARCH PARSER');
           break;
-
         case 'OBJECT_TSDICTIONARY':
           output.push('TEXT SEARCH DICTIONARY');
           break;
-
         case 'OBJECT_TSTEMPLATE':
           output.push('TEXT SEARCH TEMPLATE');
           break;
-
         case 'OBJECT_TSCONFIGURATION':
           output.push('TEXT SEARCH CONFIGURATION');
           break;
-
         case 'OBJECT_COLLATION':
           output.push('COLLATION');
           break;
-
         default:
           throw new Error('DefineStmt not recognized');
       }
-
       if (node.if_not_exists) {
         output.push('IF NOT EXISTS');
       }
-
       switch (node.kind) {
         case 'OBJECT_AGGREGATE':
           // output.push(this.deparse(node.defnames));
           output.push(this.list(node.defnames, '.', '', context));
           break;
-
         case 'OBJECT_OPERATOR':
-          output.push(this.list(node.defnames, '.', '', context)); // output.push(this.deparse(node.defnames));
-
+          output.push(this.list(node.defnames, '.', '', context));
+          // output.push(this.deparse(node.defnames));
           break;
-
         case 'OBJECT_TYPE':
         case 'OBJECT_TSPARSER':
         case 'OBJECT_TSDICTIONARY':
@@ -1133,68 +967,53 @@ var Deparser = /*#__PURE__*/function () {
         case 'OBJECT_COLLATION':
           output.push(this.deparse(node.defnames));
           break;
-
         default:
           throw new Error('DefineStmt not recognized');
       }
-
       if (!node.oldstyle && node.kind == 'OBJECT_AGGREGATE') {
         output.push('(');
         output.push("".concat(this.listQuotes(node.args[0], ',')));
         output.push(')');
       }
-
-      if (node.definition.length > 0) {
+      var definition = unwrapList(node.definition);
+      if (definition.length > 0) {
         output.push('(');
-
-        for (var n = 0; n < node.definition.length; n++) {
-          var defElement = node.definition[n].DefElem;
+        for (var n = 0; n < definition.length; n++) {
+          var defElement = definition[n].DefElem;
           output.push(defElement.defname);
-
           if (defElement.arg) {
             output.push('=');
             output.push(this.deparse(defElement.arg));
           }
-
-          if (n !== node.definition.length - 1) {
+          if (n !== definition.length - 1) {
             output.push(',');
           }
         }
-
         output.push(')');
       }
-
       return output.join(' ');
     }
   }, {
     key: 'DefElem',
     value: function DefElem(node) {
       var _this8 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (node.defname === 'transaction_isolation') {
         return (0, _util.format)('ISOLATION LEVEL %s', node.arg.A_Const.val.String.str.toUpperCase());
       }
-
       if (node.defname === 'transaction_read_only') {
         return node.arg.A_Const.val.Integer.ival === 0 ? 'READ WRITE' : 'READ ONLY';
       }
-
       if (node.defname === 'transaction_deferrable') {
         return node.arg.A_Const.val.Integer.ival === 0 ? 'NOT DEFERRABLE' : 'DEFERRABLE';
       }
-
       if (node.defname === 'set') {
         return this.deparse(node.arg, context);
       }
-
       var name = node.defname;
-
       if (node.defnamespace) {
         name = "".concat(node.defnamespace, ".").concat(node.defname);
       }
-
       if (context === 'generated' || context === 'sequence') {
         switch (name) {
           case 'start':
@@ -1202,69 +1021,56 @@ var Deparser = /*#__PURE__*/function () {
               var start = this.deparse(node.arg, context);
               return "START WITH ".concat(start);
             }
-
           case 'increment':
             {
               var inc = this.deparse(node.arg, context);
-
               if (context === 'sequence') {
                 // we need 'simple' so it doesn't wrap negative numbers in parens
                 return "".concat(name, " ").concat(this.deparse(node.arg, 'simple'));
               }
-
               return "INCREMENT BY ".concat(inc);
             }
-
           case 'sequence_name':
             {
               return "SEQUENCE NAME ".concat(this.listQuotes(node.arg, '.'));
             }
-
           case 'cycle':
             {
               var on = this.deparse(node.arg, context) + '' === '1';
               return on ? 'CYCLE' : 'NO CYCLE';
             }
-
           case 'minvalue':
             {
               var off = !node.hasOwnProperty('arg');
               return off ? 'NO MINVALUE' : "".concat(name, " ").concat(this.deparse(node.arg, 'simple'));
             }
-
           case 'maxvalue':
             {
               var _off = !node.hasOwnProperty('arg');
-
               return _off ? 'NO MAXVALUE' : "".concat(name, " ").concat(this.deparse(node.arg, 'simple'));
             }
           // alter
-
           case 'owned_by':
             {
               var output = [];
-              node.arg.forEach(function (opt) {
+              unwrapList(node.arg).forEach(function (opt) {
                 output.push(_this8.quote(_this8.deparse(opt, context)));
               });
               return "OWNED BY ".concat(output.join('.'));
             }
           // alter
-
           case 'restart':
             {
               if (node.arg) {
                 return "RESTART WITH ".concat(this.deparse(node.arg, context));
               }
-
               return "RESTART";
             }
-
           default:
             if (node.arg) {
               // we need 'simple' so it doesn't wrap negative numbers in parens
               return "".concat(name, " ").concat(this.deparse(node.arg, 'simple'));
             }
-
         }
       } else if (context === 'explain') {
         if (node.arg) {
@@ -1273,7 +1079,6 @@ var Deparser = /*#__PURE__*/function () {
       } else if (node.arg) {
         return "".concat(name, " = ").concat(this.deparse(node.arg, context));
       }
-
       return name;
     }
   }, {
@@ -1288,74 +1093,60 @@ var Deparser = /*#__PURE__*/function () {
       if (node.str[0] === '-') {
         return "(".concat(node.str, ")");
       }
-
       return node.str;
     }
   }, {
     key: 'FuncCall',
     value: function FuncCall(node) {
       var _this9 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       var params = [];
-
       if (node.args) {
-        params = node.args.map(function (item) {
+        params = unwrapList(node.args).map(function (item) {
           return _this9.deparse(item, context);
         });
-      } // COUNT(*)
-
+      }
 
+      // COUNT(*)
       if (node.agg_star) {
         params.push('*');
       }
-
       var name = this.list(node.funcname, '.', '', context);
       var order = [];
       var withinGroup = node.agg_within_group;
-
       if (node.agg_order) {
         order.push('ORDER BY');
         order.push(this.list(node.agg_order, ', ', '', context));
       }
-
       var call = [];
       call.push(name + '(');
-
       if (node.agg_distinct) {
         call.push('DISTINCT ');
-      } // prepend variadic before the last parameter
-      // SELECT CONCAT('|', VARIADIC ARRAY['1','2','3'])
-
+      }
 
+      // prepend variadic before the last parameter
+      // SELECT CONCAT('|', VARIADIC ARRAY['1','2','3'])
       if (node.func_variadic) {
         params[params.length - 1] = 'VARIADIC ' + params[params.length - 1];
       }
-
       call.push(params.join(', '));
-
       if (order.length && !withinGroup) {
         call.push(' ');
         call.push(order.join(' '));
       }
-
       call.push(')');
       output.push(compact(call).join(''));
-
       if (order.length && withinGroup) {
         output.push('WITHIN GROUP');
         output.push(parens(order.join(' ')));
       }
-
       if (node.agg_filter != null) {
         output.push((0, _util.format)('FILTER (WHERE %s)', this.deparse(node.agg_filter, context)));
       }
-
       if (node.over != null) {
         output.push((0, _util.format)('OVER %s', this.WindowDef(node.over, context)));
       }
-
       return output.join(' ');
     }
   }, {
@@ -1368,23 +1159,17 @@ var Deparser = /*#__PURE__*/function () {
     key: 'GroupingSet',
     value: function GroupingSet(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       switch (node.kind) {
         case 'GROUPING_SET_EMPTY':
           return '()';
-
         case 'GROUPING_SET_SIMPLE':
           return fail('GroupingSet', node);
-
         case 'GROUPING_SET_ROLLUP':
           return 'ROLLUP (' + this.list(node.content, ', ', '', context) + ')';
-
         case 'GROUPING_SET_CUBE':
           return 'CUBE (' + this.list(node.content, ', ', '', context) + ')';
-
         case 'GROUPING_SET_SETS':
           return 'GROUPING SETS (' + this.list(node.content, ', ', '', context) + ')';
-
         default:
           return fail('GroupingSet', node);
       }
@@ -1395,50 +1180,39 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('CREATE');
-
       if (node.unique) {
         output.push('UNIQUE');
       }
-
       output.push('INDEX');
-
       if (node.concurrent) {
         output.push('CONCURRENTLY');
       }
-
       if (node.idxname) {
         output.push(node.idxname);
       }
-
       output.push('ON');
       output.push(this.RangeVar(node.relation, context));
-
       if (node.accessMethod) {
         var accessMethod = node.accessMethod.toUpperCase();
-
         if (accessMethod !== 'BTREE') {
           output.push('USING');
           output.push(accessMethod);
         }
       }
-
       if (node.indexParams) {
         output.push('(');
         output.push(this.list(node.indexParams, ', ', '', context));
         output.push(')');
       }
-
       if (node.indexIncludingParams) {
         output.push('INCLUDE (');
         output.push(this.list(node.indexIncludingParams, ', ', '', context));
         output.push(')');
       }
-
       if (node.whereClause) {
         output.push('WHERE');
         output.push(this.deparse(node.whereClause, context));
       }
-
       return output.join(' ');
     }
   }, {
@@ -1446,23 +1220,18 @@ var Deparser = /*#__PURE__*/function () {
     value: function IndexElem(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.name) {
         output.push(node.name);
-
         if (node.ordering === 'SORTBY_DESC') {
           output.push('DESC');
         } else if (node.ordering === 'SORTBY_ASC') {
           output.push('ASC');
         }
-
         return output.join(' ');
       }
-
       if (node.expr) {
         return this.deparse(node.expr, context);
       }
-
       return fail('IndexElem', node);
     }
   }, {
@@ -1470,30 +1239,25 @@ var Deparser = /*#__PURE__*/function () {
     value: function InsertStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.withClause) {
         output.push(this.WithClause(node.withClause, context));
       }
-
       output.push('INSERT INTO');
       output.push(this.RangeVar(node.relation, context));
-
-      if (node.cols && node.cols.length) {
+      var cols = unwrapList(node.cols);
+      if (cols && cols.length) {
         output.push('(');
-        output.push(this.list(node.cols, ', ', '', context));
+        output.push(this.list(cols, ', ', '', context));
         output.push(')');
       }
-
       if (node.selectStmt) {
         output.push(this.deparse(node.selectStmt, context));
       } else {
         output.push('DEFAULT VALUES');
       }
-
       if (node.onConflictClause) {
         var clause = node.onConflictClause;
         output.push('ON CONFLICT');
-
         if (clause.infer.indexElems) {
           output.push('(');
           output.push(this.list(clause.infer.indexElems, ', ', '', context));
@@ -1502,27 +1266,22 @@ var Deparser = /*#__PURE__*/function () {
           output.push('ON CONSTRAINT');
           output.push(clause.infer.conname);
         }
-
         switch (clause.action) {
           case 'ONCONFLICT_NOTHING':
             output.push('DO NOTHING');
             break;
-
           case 'ONCONFLICT_UPDATE':
             output.push('DO');
             output.push(this.UpdateStmt(clause, context));
             break;
-
           default:
             throw new Error('unhandled CONFLICT CLAUSE');
         }
       }
-
       if (node.returningList) {
         output.push('RETURNING');
         output.push(this.deparseReturningList(node.returningList, context));
       }
-
       return output.join(' ');
     }
   }, {
@@ -1543,95 +1302,78 @@ var Deparser = /*#__PURE__*/function () {
     value: function DeleteStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [''];
-
       if (node.withClause) {
         output.push(this.WithClause(node.withClause, context));
       }
-
       output.push('DELETE');
       output.push('FROM');
       output.push(this.RangeVar(node.relation, context));
-
       if (node.usingClause) {
         output.push('USING');
         output.push(this.list(node.usingClause, ', ', '', context));
       }
-
       if (node.whereClause) {
         output.push('WHERE');
         output.push(this.deparse(node.whereClause, context));
       }
-
       if (node.returningList) {
         output.push('RETURNING');
         output.push(this.deparseReturningList(node.returningList, context));
       }
-
       return output.join(' ');
     }
   }, {
     key: 'UpdateStmt',
     value: function UpdateStmt(node) {
       var _this10 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.withClause) {
         output.push(this.WithClause(node.withClause, context));
       }
-
       output.push('UPDATE');
-
       if (node.relation) {
         // onConflictClause no relation..
         output.push(this.RangeVar(node.relation, context));
       }
-
       output.push('SET');
-
-      if (node.targetList && node.targetList.length) {
-        if (node.targetList[0].ResTarget && node.targetList[0].ResTarget.val && node.targetList[0].ResTarget.val.MultiAssignRef) {
+      var targetList = unwrapList(node.targetList);
+      if (targetList && targetList.length) {
+        if (targetList[0].ResTarget && targetList[0].ResTarget.val && targetList[0].ResTarget.val.MultiAssignRef) {
           output.push('(');
-          output.push(node.targetList.map(function (target) {
+          output.push(targetList.map(function (target) {
             return target.ResTarget.name;
           }).join(','));
           output.push(')');
           output.push('=');
-          output.push(this.deparse(node.targetList[0].ResTarget.val, context));
+          output.push(this.deparse(targetList[0].ResTarget.val, context));
         } else {
-          output.push(node.targetList.map(function (target) {
+          output.push(targetList.map(function (target) {
             return _this10.deparse(target, 'update');
           }).join(','));
         }
       }
-
       if (node.fromClause) {
         output.push('FROM');
         output.push(this.list(node.fromClause, ', ', '', context));
       }
-
       if (node.whereClause) {
         output.push('WHERE');
         output.push(this.deparse(node.whereClause, context));
       }
-
       if (node.returningList) {
         output.push('RETURNING');
         output.push(this.deparseReturningList(node.returningList, context));
       }
-
       return output.join(' ');
     }
   }, {
     key: 'Integer',
     value: function Integer(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (node.ival < 0 && context !== 'simple') {
         return "(".concat(node.ival, ")");
       }
-
       return node.ival.toString();
     }
   }, {
@@ -1646,45 +1388,34 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push(this.deparse(node.larg, context));
-
       if (node.isNatural) {
         output.push('NATURAL');
       }
-
       var join = null;
-
       switch (true) {
         case node.jointype === 'JOIN_INNER' && node.quals != null:
           join = 'INNER JOIN';
           break;
-
         case node.jointype === 'JOIN_INNER' && !node.isNatural && !(node.quals != null) && !(node.usingClause != null):
           join = 'CROSS JOIN';
           break;
-
         case node.jointype === 'JOIN_INNER':
           join = 'JOIN';
           break;
-
         case node.jointype === 'JOIN_LEFT':
           join = 'LEFT OUTER JOIN';
           break;
-
         case node.jointype === 'JOIN_FULL':
           join = 'FULL OUTER JOIN';
           break;
-
         case node.jointype === 'JOIN_RIGHT':
           join = 'RIGHT OUTER JOIN';
           break;
-
         default:
           fail('JoinExpr', node);
           break;
       }
-
       output.push(join);
-
       if (node.rarg) {
         // wrap nested join expressions in parens to make the following symmetric:
         // select * from int8_tbl x cross join (int4_tbl x cross join lateral (select x.f1) ss)
@@ -1694,22 +1425,17 @@ var Deparser = /*#__PURE__*/function () {
           output.push(this.deparse(node.rarg, context));
         }
       }
-
       if (node.quals) {
         output.push("ON ".concat(this.deparse(node.quals, context)));
       }
-
       if (node.usingClause) {
         var using = this.quote(this.deparseNodes(node.usingClause, context)).join(', ');
         output.push("USING (".concat(using, ")"));
       }
-
       var wrapped = node.rarg.JoinExpr != null || node.alias ? '(' + output.join(' ') + ')' : output.join(' ');
-
       if (node.alias) {
         return wrapped + ' ' + this.Alias(node.alias, context);
       }
-
       return wrapped;
     }
   }, {
@@ -1717,37 +1443,29 @@ var Deparser = /*#__PURE__*/function () {
     value: function LockingClause(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       switch (node.strength) {
         case 'LCS_NONE':
           output.push('NONE');
           break;
-
         case 'LCS_FORKEYSHARE':
           output.push('FOR KEY SHARE');
           break;
-
         case 'LCS_FORSHARE':
           output.push('FOR SHARE');
           break;
-
         case 'LCS_FORNOKEYUPDATE':
           output.push('FOR NO KEY UPDATE');
           break;
-
         case 'LCS_FORUPDATE':
           output.push('FOR UPDATE');
           break;
-
         default:
           return fail('LockingClause', node);
       }
-
       if (node.lockedRels) {
         output.push('OF');
         output.push(this.list(node.lockedRels, ', ', '', context));
       }
-
       return output.join(' ');
     }
   }, {
@@ -1761,11 +1479,9 @@ var Deparser = /*#__PURE__*/function () {
       output.push('IN');
       output.push(LOCK_MODES[node.mode]);
       output.push('MODE');
-
       if (node.nowait) {
         output.push('NOWAIT');
       }
-
       return output.join(' ');
     }
   }, {
@@ -1773,13 +1489,11 @@ var Deparser = /*#__PURE__*/function () {
     value: function MinMaxExpr(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.op === 'IS_GREATEST') {
         output.push('GREATEST');
       } else {
         output.push('LEAST');
       }
-
       output.push(parens(this.list(node.args, ', ', '', context)));
       return output.join('');
     }
@@ -1803,13 +1517,11 @@ var Deparser = /*#__PURE__*/function () {
     value: function NullTest(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [this.deparse(node.arg, context)];
-
       if (node.nulltesttype === 'IS_NULL') {
         output.push('IS NULL');
       } else if (node.nulltesttype === 'IS_NOT_NULL') {
         output.push('IS NOT NULL');
       }
-
       return output.join(' ');
     }
   }, {
@@ -1818,7 +1530,6 @@ var Deparser = /*#__PURE__*/function () {
       if (node.number >= 0) {
         return ['$', node.number].join('');
       }
-
       return '?';
     }
   }, {
@@ -1826,50 +1537,40 @@ var Deparser = /*#__PURE__*/function () {
     value: function RangeFunction(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.lateral) {
         output.push('LATERAL');
       }
-
       var funcs = [];
-
-      for (var i = 0; i < node.functions.length; i++) {
-        var funcCall = node.functions[i];
+      var functions = unwrapList(node.functions);
+      for (var i = 0; i < functions.length; i++) {
+        var funcCall = unwrapList(functions[i]);
         var call = [this.deparse(funcCall[0], context)];
-
-        if (funcCall[1] && funcCall[1].length) {
-          call.push((0, _util.format)('AS (%s)', this.list(funcCall[1], ', ', '', context)));
+        var secondFuncCall = unwrapList(funcCall[1]);
+        if (secondFuncCall && secondFuncCall.length) {
+          call.push((0, _util.format)('AS (%s)', this.list(secondFuncCall, ', ', '', context)));
         }
-
         funcs.push(call.join(' '));
       }
-
       var calls = funcs.join(', ');
-
       if (node.is_rowsfrom) {
         output.push("ROWS FROM (".concat(calls, ")"));
       } else {
         output.push(calls);
       }
-
       if (node.ordinality) {
         output.push('WITH ORDINALITY');
       }
-
       if (node.alias) {
         output.push(this.Alias(node.alias, context));
       }
-
       if (node.coldeflist) {
         var defList = this.list(node.coldeflist, ', ', '', context);
-
         if (!node.alias) {
           output.push(" AS (".concat(defList, ")"));
         } else {
           output.push("(".concat(defList, ")"));
         }
       }
-
       return output.join(' ');
     }
   }, {
@@ -1877,17 +1578,13 @@ var Deparser = /*#__PURE__*/function () {
     value: function RangeSubselect(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = '';
-
       if (node.lateral) {
         output += 'LATERAL ';
       }
-
       output += parens(this.deparse(node.subquery, context));
-
       if (node.alias) {
         return output + ' ' + this.Alias(node.alias, context);
       }
-
       return output;
     }
   }, {
@@ -1897,16 +1594,13 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push(this.deparse(node.relation, context));
       output.push('TABLESAMPLE');
-      output.push(this.deparse(node.method[0], context));
-
+      output.push(this.deparse(unwrapList(node.method)[0], context));
       if (node.args) {
         output.push(parens(this.list(node.args, ', ', '', context)));
       }
-
       if (node.repeatable) {
         output.push('REPEATABLE(' + this.deparse(node.repeatable, context) + ')');
       }
-
       return output.join(' ');
     }
   }, {
@@ -1914,40 +1608,32 @@ var Deparser = /*#__PURE__*/function () {
     value: function RangeVar(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.inhOpt === 0) {
         output.push('ONLY');
       }
-
       if (!node.inh && (context.lock || context === 'truncate')) {
         output.push('ONLY');
       }
-
       if (node.relpersistence === 'u') {
         output.push('UNLOGGED');
       }
-
       if (node.relpersistence === 't' && context !== 'view') {
         output.push('TEMPORARY TABLE');
       }
-
       if (node.schemaname != null) {
         output.push("".concat(this.quote(node.schemaname), ".").concat(this.quote(node.relname)));
       } else {
         output.push(this.quote(node.relname));
       }
-
       if (node.alias) {
         output.push(this.Alias(node.alias, context));
       }
-
       return output.join(' ');
     }
   }, {
     key: 'ResTarget',
     value: function ResTarget(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (context === 'select') {
         return compact([this.deparse(node.val, context), this.quote(node.name)]).join(' AS ');
       } else if (context === 'update') {
@@ -1955,18 +1641,15 @@ var Deparser = /*#__PURE__*/function () {
       } else if (!(node.val != null)) {
         return this.quote(node.name);
       }
-
       return fail('ResTarget', node);
     }
   }, {
     key: 'RowExpr',
     value: function RowExpr(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (node.row_format === 'COERCE_IMPLICIT_CAST') {
         return parens(this.list(node.args, ', ', '', context));
       }
-
       return (0, _util.format)('ROW(%s)', this.list(node.args, ', ', '', context));
     }
   }, {
@@ -1975,13 +1658,11 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('EXPLAIN');
-
       if (node.options) {
         output.push('(');
         output.push(this.list(node.options, ', ', '', 'explain'));
         output.push(')');
       }
-
       output.push(this.deparse(node.query, context));
       return output.join(' ');
     }
@@ -1989,14 +1670,11 @@ var Deparser = /*#__PURE__*/function () {
     key: 'SelectStmt',
     value: function SelectStmt(node) {
       var _this11 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.withClause) {
         output.push(this.WithClause(node.withClause, context));
       }
-
       if (node.op === 'SETOP_NONE') {
         // VALUES select's don't get SELECT
         if (node.valuesLists == null) {
@@ -2004,133 +1682,111 @@ var Deparser = /*#__PURE__*/function () {
         }
       } else {
         output.push(parens(this.SelectStmt(node.larg, context)));
-
         switch (node.op) {
           case 'SETOP_NONE':
             output.push('NONE');
             break;
-
           case 'SETOP_UNION':
             output.push('UNION');
             break;
-
           case 'SETOP_INTERSECT':
             output.push('INTERSECT');
             break;
-
           case 'SETOP_EXCEPT':
             output.push('EXCEPT');
             break;
-
           default:
             throw new Error('bad SelectStmt op');
         }
-
         if (node.all) {
           output.push('ALL');
         }
-
         output.push(parens(this.SelectStmt(node.rarg, context)));
       }
-
       if (node.distinctClause) {
-        if (!isEmptyObject(node.distinctClause[0]) // new change distinctClause can be {}
+        var distinctClause = unwrapList(node.distinctClause);
+        if (!isEmptyObject(distinctClause[0])
+        // new change distinctClause can be {}
         ) {
-            output.push('DISTINCT ON');
-            var clause = node.distinctClause.map(function (e) {
-              return _this11.deparse(e, 'select');
-            }).join(",".concat(NEWLINE_CHAR));
-            output.push("(".concat(clause, ")"));
-          } else {
+          output.push('DISTINCT ON');
+          var clause = distinctClause.map(function (e) {
+            return _this11.deparse(e, 'select');
+          }).join(",".concat(NEWLINE_CHAR));
+          output.push("(".concat(clause, ")"));
+        } else {
           output.push('DISTINCT');
         }
       }
-
       if (node.targetList) {
-        output.push(indent(node.targetList.map(function (e) {
+        output.push(indent(unwrapList(node.targetList).map(function (e) {
           return _this11.deparse(e, 'select');
         }).join(",".concat(NEWLINE_CHAR))));
       }
-
       if (node.intoClause) {
         output.push('INTO');
         output.push(indent(this.IntoClause(node.intoClause, context)));
       }
-
       if (node.fromClause) {
         output.push('FROM');
-        output.push(indent(node.fromClause.map(function (e) {
+        output.push(indent(unwrapList(node.fromClause).map(function (e) {
           return _this11.deparse(e, 'from');
         }).join(",".concat(NEWLINE_CHAR))));
       }
-
       if (node.whereClause) {
         output.push('WHERE');
         output.push(indent(this.deparse(node.whereClause, context)));
       }
-
       if (node.valuesLists) {
         output.push('VALUES');
-        var lists = node.valuesLists.map(function (list) {
+        var lists = unwrapList(node.valuesLists).map(function (list) {
           return "(".concat(_this11.list(list, ', ', '', context), ")");
         });
         output.push(lists.join(', '));
       }
-
       if (node.groupClause) {
         output.push('GROUP BY');
-        output.push(indent(node.groupClause.map(function (e) {
+        output.push(indent(unwrapList(node.groupClause).map(function (e) {
           return _this11.deparse(e, 'group');
         }).join(",".concat(NEWLINE_CHAR))));
       }
-
       if (node.havingClause) {
         output.push('HAVING');
         output.push(indent(this.deparse(node.havingClause, context)));
       }
-
       if (node.windowClause) {
         output.push('WINDOW');
         var windows = [];
-
-        for (var i = 0; i < node.windowClause.length; i++) {
-          var w = node.windowClause[i];
+        var windowClause = unwrapList(node.windowClause);
+        for (var i = 0; i < windowClause.length; i++) {
+          var w = windowClause[i];
           var window = [];
-
           if (w.WindowDef.name) {
             window.push(this.quote(w.WindowDef.name) + ' AS');
           }
-
           window.push(parens(this.deparse(w, 'window')));
           windows.push(window.join(' '));
         }
-
         output.push(windows.join(', '));
       }
-
       if (node.sortClause) {
         output.push('ORDER BY');
-        output.push(indent(node.sortClause.map(function (e) {
+        output.push(indent(unwrapList(node.sortClause).map(function (e) {
           return _this11.deparse(e, 'sort');
         }).join(",".concat(NEWLINE_CHAR))));
       }
-
       if (node.limitCount) {
         output.push('LIMIT');
         output.push(indent(this.deparse(node.limitCount, context)));
       }
-
       if (node.limitOffset) {
         output.push('OFFSET');
         output.push(indent(this.deparse(node.limitOffset, context)));
       }
-
       if (node.lockingClause) {
         node.lockingClause.forEach(function (item) {
           return output.push(_this11.deparse(item, context));
         });
       }
-
       return output.join(' ');
     }
   }, {
@@ -2139,15 +1795,12 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = ['TRUNCATE TABLE'];
       output.push(this.list(node.relations, ', ', '', 'truncate'));
-
       if (node.restart_seqs) {
         output.push('RESTART IDENTITY');
       }
-
       if (node.behavior === 'DROP_CASCADE') {
         output.push('CASCADE');
       }
-
       return output.join(' ');
     }
   }, {
@@ -2156,27 +1809,23 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('ALTER DEFAULT PRIVILEGES');
-      var options = dotty.get(node, 'options');
-
+      var options = unwrapList(dotty.get(node, 'options'));
       if (options) {
-        var elem = node.options.find(function (el) {
+        var elem = options.find(function (el) {
           return el.hasOwnProperty('DefElem');
         });
-
+        var elemDefElemArg = unwrapList(elem.DefElem.arg);
         if (elem.DefElem.defname === 'schemas') {
           output.push('IN SCHEMA');
-          output.push(dotty.get(elem, 'DefElem.arg.0.String.str'));
+          output.push(elemDefElemArg[0].String.str);
         }
-
         if (elem.DefElem.defname === 'roles') {
           output.push('FOR ROLE');
-          var roleSpec = dotty.get(elem, 'DefElem.arg.0');
+          var roleSpec = elemDefElemArg[0];
           output.push(this.deparse(roleSpec, context));
         }
-
         output.push(NEWLINE_CHAR);
       }
-
       output.push(this.GrantStmt(node.action, context));
       return output.join(' ');
     }
@@ -2185,15 +1834,11 @@ var Deparser = /*#__PURE__*/function () {
     value: function AlterTableStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
-      var ctx = _objectSpread({}, context);
-
+      var ctx = Object.assign({}, context);
       output.push('ALTER');
-
       if (node.relkind === 'OBJECT_TABLE') {
         output.push('TABLE');
         var inh = dotty.get(node, 'relation.inh');
-
         if (!inh) {
           output.push('ONLY');
         }
@@ -2202,11 +1847,9 @@ var Deparser = /*#__PURE__*/function () {
       } else {
         fail('AlterTableStmt', node);
       }
-
       if (node.missing_ok) {
         output.push('IF EXISTS');
       }
-
       ctx.alterType = node.relkind;
       output.push(this.RangeVar(node.relation, ctx));
       output.push(this.list(node.cmds, ', ', '', ctx));
@@ -2218,26 +1861,21 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       var subType = 'COLUMN';
-
       if (context && context.alterType === 'OBJECT_TYPE') {
         subType = 'ATTRIBUTE';
       }
-
       if (node.subtype === 'AT_AddColumn') {
         output.push('ADD');
         output.push(subType);
-
         if (node.missing_ok) {
           output.push('IF NOT EXISTS');
         }
-
         output.push(this.quote(node.name));
         output.push(this.deparse(node.def, context));
       } else if (node.subtype === 'AT_ColumnDefault') {
         output.push('ALTER');
         output.push(subType);
         output.push(this.quote(node.name));
-
         if (node.def) {
           output.push('SET DEFAULT');
           output.push(this.deparse(node.def, context));
@@ -2271,7 +1909,6 @@ var Deparser = /*#__PURE__*/function () {
         output.push('ALTER');
         output.push(this.quote(node.name));
         output.push('SET STORAGE');
-
         if (node.def) {
           output.push(this.deparse(node.def, context));
         } else {
@@ -2280,11 +1917,9 @@ var Deparser = /*#__PURE__*/function () {
       } else if (node.subtype === 'AT_DropColumn') {
         output.push('DROP');
         output.push(subType);
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         output.push(this.quote(node.name));
       } else if (node.subtype === 'AT_AddConstraint') {
         // output.push('ADD CONSTRAINT');
@@ -2295,11 +1930,9 @@ var Deparser = /*#__PURE__*/function () {
         output.push(this.quote(node.name, context));
       } else if (node.subtype === 'AT_DropConstraint') {
         output.push('DROP CONSTRAINT');
-
         if (node.missing_ok) {
           output.push('IF EXISTS');
         }
-
         output.push(this.quote(node.name));
       } else if (node.subtype === 'AT_AlterColumnType') {
         output.push('ALTER');
@@ -2345,7 +1978,8 @@ var Deparser = /*#__PURE__*/function () {
         output.push('OF');
         output.push(this.deparse(node.def, context));
       } else if (node.subtype === 'AT_DropOf') {
-        output.push('NOT OF'); //output.push(this.deparse(node.def));
+        output.push('NOT OF');
+        //output.push(this.deparse(node.def));
       } else if (node.subtype === 'AT_EnableRowSecurity') {
         output.push('ENABLE ROW LEVEL SECURITY');
       } else if (node.subtype === 'AT_DisableRowSecurity') {
@@ -2355,11 +1989,9 @@ var Deparser = /*#__PURE__*/function () {
       } else if (node.subtype === 'AT_NoForceRowSecurity') {
         output.push('NO FORCE ROW SECURITY');
       }
-
       if (node.behavior === 'DROP_CASCADE') {
         output.push('CASCADE');
       }
-
       return output.join(' ');
     }
   }, {
@@ -2371,7 +2003,7 @@ var Deparser = /*#__PURE__*/function () {
       output.push(this.list(node.typeName, '.', '', context));
       output.push('AS ENUM');
       output.push("(".concat(NEWLINE_CHAR));
-      var vals = node.vals.map(function (val) {
+      var vals = unwrapList(node.vals).map(function (val) {
         return {
           String: {
             str: "'".concat(val.String.str, "'")
@@ -2394,29 +2026,23 @@ var Deparser = /*#__PURE__*/function () {
         }
       };
       output.push(this.deparse(typObj, context));
-
       if (node.newVal) {
         output.push('ADD VALUE');
         var result = node.newVal.replace(/'/g, "''");
         output.push("'".concat(result, "'"));
       }
-
       if (node.newValNeighbor) {
         if (node.newValIsAfter) {
           output.push('AFTER');
         } else {
           output.push('BEFORE');
         }
-
         var _result = node.newValNeighbor.replace(/'/g, "''");
-
         output.push("'".concat(_result, "'"));
       }
-
       if (node.behavior === 'DROP_CASCADE') {
         output.push('CASCADE');
       }
-
       return output.join(' ');
     }
   }, {
@@ -2431,7 +2057,6 @@ var Deparser = /*#__PURE__*/function () {
         }
       };
       output.push(this.deparse(typObj, context));
-
       if (node.subtype === 'C') {
         output.push('ADD');
         output.push(this.deparse(node.def, context));
@@ -2444,40 +2069,32 @@ var Deparser = /*#__PURE__*/function () {
         output.push('CONSTRAINT');
         output.push(this.quote(node.name));
       }
-
       if (node.behavior === 'DROP_CASCADE') {
         output.push('CASCADE');
       }
-
       return output.join(' ');
     }
   }, {
     key: 'CreateExtensionStmt',
     value: function CreateExtensionStmt(node) {
       var _this12 = this;
-
       var output = [];
       output.push('CREATE EXTENSION');
-
       if (node.if_not_exists) {
         output.push('IF NOT EXISTS');
       }
-
       output.push(this.quote(node.extname));
-
       if (node.options) {
         node.options.forEach(function (opt) {
           if (opt.DefElem.defname === 'cascade' && opt.DefElem.arg.Integer.ival === 1) {
             output.push('CASCADE');
           }
-
           if (opt.DefElem.defname === 'schema') {
             output.push('WITH SCHEMA');
             output.push(_this12.quote(_this12.deparse(opt.DefElem.arg)));
           }
         });
       }
-
       return output.join(' ');
     }
   }, {
@@ -2487,17 +2104,14 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push('DROP');
       output.push((0, _pgsqlEnums.objtypeName)(node.removeType));
-
       if (node.missing_ok) {
         output.push('IF EXISTS');
       }
-
       var stmts = [];
-
-      for (var s = 0; s < node.objects.length; s++) {
-        var children = node.objects[s];
+      var objects = unwrapList(node.objects);
+      for (var s = 0; s < objects.length; s++) {
+        var children = unwrapList(objects[s]);
         var stmt = [];
-
         if (node.removeType === 'OBJECT_TABLE' || node.removeType === 'OBJECT_CONVERSION' || node.removeType === 'OBJECT_COLLATION' || node.removeType === 'OBJECT_MATVIEW' || node.removeType === 'OBJECT_INDEX' || node.removeType === 'OBJECT_FOREIGN_TABLE') {
           if (children.length === 1) {
             stmt.push(this.quote(this.deparse(children[0])));
@@ -2553,14 +2167,15 @@ var Deparser = /*#__PURE__*/function () {
             stmt.push(this.listQuotes(children, '.'));
           } else {
             throw new Error('bad drop value stmt: ' + JSON.stringify(node, null, 2));
-          } // } else if (node.removeType === 'OBJECT_OPERATOR') {
-
+          }
+          // } else if (node.removeType === 'OBJECT_OPERATOR') {
         } else if (node.removeType === 'OBJECT_CAST') {
           stmt.push('(');
           stmt.push(this.deparse(children[0], context));
           stmt.push('AS');
           stmt.push(this.deparse(children[1], context));
-          stmt.push(')'); // } else if (node.removeType === 'OBJECT_OPERATOR') {
+          stmt.push(')');
+          // } else if (node.removeType === 'OBJECT_OPERATOR') {
           //   stmt.push(this.deparse(children, 'noquotes')); // in this case children is not an array
         } else if (node.removeType === 'OBJECT_AGGREGATE') {
           stmt.push(this.deparse(children, context)); // in this case children is not an array
@@ -2579,16 +2194,12 @@ var Deparser = /*#__PURE__*/function () {
         } else {
           throw new Error('bad drop stmt: ' + JSON.stringify(node, null, 2));
         }
-
         stmts.push(stmt.join(' '));
       }
-
       output.push(stmts.join(','));
-
       if (node.behavior === 'DROP_CASCADE') {
         output.push('CASCADE');
       }
-
       return output.join(' ');
     }
   }, {
@@ -2598,40 +2209,34 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push('CREATE POLICY');
       output.push(this.quote(node.policy_name));
-
       if (node.table) {
         output.push('ON');
         output.push(this.RangeVar(node.table, context));
       }
-
-      if (node.permissive) {// permissive is the default!
+      if (node.permissive) {
+        // permissive is the default!
       } else {
         output.push('AS');
         output.push('RESTRICTIVE');
       }
-
       if (node.cmd_name) {
         output.push('FOR');
         output.push(node.cmd_name.toUpperCase());
       }
-
       output.push('TO');
       output.push(this.list(node.roles));
-
       if (node.qual) {
         output.push('USING');
         output.push('(');
         output.push(this.deparse(node.qual, context));
         output.push(')');
       }
-
       if (node.with_check) {
         output.push('WITH CHECK');
         output.push('(');
         output.push(this.deparse(node.with_check, context));
         output.push(')');
       }
-
       return output.join(' ');
     }
   }, {
@@ -2641,29 +2246,24 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push('ALTER POLICY');
       output.push(this.quote(node.policy_name));
-
       if (node.table) {
         output.push('ON');
         output.push(this.RangeVar(node.table, context));
       }
-
       output.push('TO');
       output.push(this.list(node.roles));
-
       if (node.qual) {
         output.push('USING');
         output.push('(');
         output.push(this.deparse(node.qual, context));
         output.push(')');
       }
-
       if (node.with_check) {
         output.push('WITH CHECK');
         output.push('(');
         output.push(this.deparse(node.with_check, context));
         output.push(')');
       }
-
       return output.join(' ');
     }
   }, {
@@ -2673,65 +2273,55 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push('CREATE');
       if (node.replace) output.push('OR REPLACE');
-
       if (node.view.relpersistence === 't') {
         output.push('TEMPORARY');
       }
-
       output.push('VIEW');
       output.push(this.RangeVar(node.view, 'view'));
-
       if (node.aliases) {
         output.push('(');
         output.push(this.list(node.aliases, ', ', '', context));
         output.push(')');
       }
-
       output.push('AS');
       output.push(this.deparse(node.query, context));
-
       if (node.withCheckOption === 'LOCAL_CHECK_OPTION') {
         output.push('WITH LOCAL CHECK OPTION');
       } else if (node.withCheckOption === 'CASCADED_CHECK_OPTION') {
         output.push('WITH CASCADED CHECK OPTION');
       }
-
       return output.join(' ');
     }
   }, {
     key: 'CreateSeqStmt',
     value: function CreateSeqStmt(node) {
       var _this13 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('CREATE SEQUENCE');
       output.push(this.RangeVar(node.sequence, context));
-
-      if (node.options && node.options.length) {
-        node.options.forEach(function (opt) {
+      var options = unwrapList(node.options);
+      if (options && options.length) {
+        options.forEach(function (opt) {
           output.push(_this13.deparse(opt, 'sequence'));
         });
       }
-
       return output.join(' ');
     }
   }, {
     key: 'AlterSeqStmt',
     value: function AlterSeqStmt(node) {
       var _this14 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('ALTER SEQUENCE');
       output.push(this.RangeVar(node.sequence, context));
-
-      if (node.options && node.options.length) {
-        node.options.forEach(function (opt) {
+      var options = unwrapList(node.options);
+      if (options && options.length) {
+        options.forEach(function (opt) {
           output.push(_this14.deparse(opt, 'sequence'));
         });
       }
-
       return output.join(' ');
     }
   }, {
@@ -2740,17 +2330,14 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = ['CREATE'];
       var relpersistence = dotty.get(node, 'into.rel.relpersistence');
-
       if (node.relkind === 'OBJECT_MATVIEW') {
         output.push('MATERIALIZED VIEW');
       } else if (relpersistence !== 't') {
         output.push('TABLE');
-
         if (node.if_not_exists) {
           output.push('IF NOT EXISTS');
         }
       }
-
       output.push(this.IntoClause(node.into, context));
       output.push('AS');
       output.push(this.deparse(node.query, context));
@@ -2760,18 +2347,17 @@ var Deparser = /*#__PURE__*/function () {
     key: 'CreateTrigStmt',
     value: function CreateTrigStmt(node) {
       var _this15 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('CREATE');
-
       if (node.isconstraint) {
         output.push('CONSTRAINT');
       }
-
       output.push('TRIGGER');
       output.push(this.quote(node.trigname));
-      output.push(NEWLINE_CHAR); // int16 timing;  BEFORE, AFTER, or INSTEAD
+      output.push(NEWLINE_CHAR);
+
+      // int16 timing;  BEFORE, AFTER, or INSTEAD
 
       if (node.timing === 64) {
         output.push('INSTEAD OF');
@@ -2779,13 +2365,15 @@ var Deparser = /*#__PURE__*/function () {
         output.push('BEFORE');
       } else {
         output.push('AFTER');
-      } // int16 events;  "OR" of INSERT/UPDATE/DELETE/TRUNCATE
+      }
+
+      // int16 events;  "OR" of INSERT/UPDATE/DELETE/TRUNCATE
+
       //  4 = 0b000100 (insert)
       //  8 = 0b001000 (delete)
       // 16 = 0b010000 (update)
       // 32 = 0b100000 (TRUNCATE)
 
-
       var TRIGGER_EVENTS = {
         INSERT: 4,
         DELETE: 8,
@@ -2793,68 +2381,59 @@ var Deparser = /*#__PURE__*/function () {
         TRUNCATE: 32
       };
       var events = [];
-
       if ((TRIGGER_EVENTS.INSERT & node.events) === TRIGGER_EVENTS.INSERT) {
         events.push('INSERT');
       }
-
       if ((TRIGGER_EVENTS.UPDATE & node.events) === TRIGGER_EVENTS.UPDATE) {
         events.push('UPDATE');
       }
-
       if ((TRIGGER_EVENTS.DELETE & node.events) === TRIGGER_EVENTS.DELETE) {
         events.push('DELETE');
       }
-
       if ((TRIGGER_EVENTS.TRUNCATE & node.events) === TRIGGER_EVENTS.TRUNCATE) {
         events.push('TRUNCATE');
-      } // events
-
+      }
 
-      output.push(events.join(' OR ')); // columns
+      // events
+      output.push(events.join(' OR '));
 
+      // columns
       if (node.columns) {
         output.push('OF');
         output.push(this.list(node.columns, ', ', '', context));
-      } // ON
-
+      }
 
+      // ON
       output.push('ON');
       output.push(this.RangeVar(node.relation, context));
       output.push(NEWLINE_CHAR);
-
       if (node.transitionRels) {
         output.push('REFERENCING');
         node.transitionRels.forEach(function (_ref) {
           var TriggerTransition = _ref.TriggerTransition;
-
           if (TriggerTransition.isNew === true && TriggerTransition.isTable === true) {
             output.push("NEW TABLE AS ".concat(TriggerTransition.name));
           } else if (TriggerTransition.isNew !== true && TriggerTransition.isTable === true) {
             output.push("OLD TABLE AS ".concat(TriggerTransition.name));
           }
         });
-      } // opts
-
+      }
 
+      // opts
       if (node.deferrable || node.initdeferred) {
         if (node.deferrable) {
           output.push('DEFERRABLE');
         }
-
         if (node.deferrable) {
           output.push('INITIALLY DEFERRED');
         }
-
         output.push(NEWLINE_CHAR);
       }
-
       if (node.row) {
         output.push("FOR EACH ROW".concat(NEWLINE_CHAR));
       } else {
         output.push("FOR EACH STATEMENT".concat(NEWLINE_CHAR));
       }
-
       if (node.whenClause) {
         output.push('WHEN');
         output.push('(');
@@ -2862,22 +2441,18 @@ var Deparser = /*#__PURE__*/function () {
         output.push(')');
         output.push(NEWLINE_CHAR);
       }
-
       output.push('EXECUTE PROCEDURE');
       output.push(this.listQuotes(node.funcname).split(',').join('.'));
       output.push('(');
       var args = [];
-
       if (node.args) {
-        args = node.args;
-      } // seems that it's only parsing strings?
-
-
+        args = unwrapList(node.args);
+      }
+      // seems that it's only parsing strings?
       args = args.map(function (arg) {
-        if (dotty.exists(arg, 'String.str')) {
-          return "'".concat(dotty.get(arg, 'String.str'), "'");
+        if (arg.String !== undefined && arg.String.str !== undefined) {
+          return "'".concat(arg.String.str, "'");
         }
-
         return _this15.deparse(arg, context);
       }).filter(function (a) {
         return a;
@@ -2895,11 +2470,9 @@ var Deparser = /*#__PURE__*/function () {
       output.push(this.list(node.domainname, '.', '', context));
       output.push('AS');
       output.push(this.TypeName(node.typeName, context));
-
       if (node.constraints) {
         output.push(this.list(node.constraints, ', ', '', context));
       }
-
       return output.join(' ');
     }
   }, {
@@ -2908,29 +2481,24 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       var relpersistence = dotty.get(node, 'relation.relpersistence');
-
       if (relpersistence === 't') {
         output.push('CREATE');
       } else {
         output.push('CREATE TABLE');
-
         if (node.if_not_exists) {
           output.push('IF NOT EXISTS');
         }
       }
-
       output.push(this.RangeVar(node.relation, context));
       output.push("(".concat(NEWLINE_CHAR));
       output.push(this.list(node.tableElts, ",".concat(NEWLINE_CHAR), TAB_CHAR, context));
       output.push("".concat(NEWLINE_CHAR, ")"));
-
       if (node.hasOwnProperty('inhRelations')) {
         output.push('INHERITS');
         output.push('(');
         output.push(this.list(node.inhRelations, ', ', '', context));
         output.push(')');
       }
-
       if (node.options) {
         // TODO was this deprecated?
         node.options.forEach(function (opt) {
@@ -2943,7 +2511,6 @@ var Deparser = /*#__PURE__*/function () {
           }
         });
       }
-
       return output.join(' ');
     }
   }, {
@@ -2951,41 +2518,35 @@ var Deparser = /*#__PURE__*/function () {
     value: function ConstraintStmt(node) {
       var output = [];
       var constraint = (0, _pgsqlEnums.getConstraintFromConstrType)(node.contype);
-
       if (node.conname) {
         output.push('CONSTRAINT');
         output.push(node.conname);
-
         if (!node.pktable) {
           output.push(constraint);
         }
       } else if (node.contype === 'CONSTR_IDENTITY') {
         // IDENTITY
         output.push('GENERATED');
-
         if (node.generated_when == 'a') {
           output.push('ALWAYS AS');
         } else {
           output.push('BY DEFAULT AS');
         }
-
         output.push('IDENTITY');
-
-        if (node.options && node.options.length) {
+        var options = unwrapList(node.options);
+        if (options && options.length) {
           output.push('(');
-          output.push(this.list(node.options, ' ', '', 'generated'));
+          output.push(this.list(options, ' ', '', 'generated'));
           output.push(')');
         }
       } else if (node.contype === 'CONSTR_GENERATED') {
         output.push('GENERATED');
-
         if (node.generated_when == 'a') {
           output.push('ALWAYS AS');
         }
       } else {
         output.push(constraint);
       }
-
       return output.join(' ');
     }
   }, {
@@ -2993,13 +2554,11 @@ var Deparser = /*#__PURE__*/function () {
     value: function ReferenceConstraint(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.pk_attrs && node.fk_attrs) {
         if (node.conname) {
           output.push('CONSTRAINT');
           output.push(node.conname);
         }
-
         output.push('FOREIGN KEY');
         output.push('(');
         output.push(this.listQuotes(node.fk_attrs));
@@ -3020,7 +2579,6 @@ var Deparser = /*#__PURE__*/function () {
           output.push('CONSTRAINT');
           output.push(node.conname);
         }
-
         output.push('FOREIGN KEY');
         output.push('(');
         output.push(this.listQuotes(node.fk_attrs));
@@ -3031,7 +2589,6 @@ var Deparser = /*#__PURE__*/function () {
         output.push(this.ConstraintStmt(node, context));
         output.push(this.RangeVar(node.pktable, context));
       }
-
       return output.join(' ');
     }
   }, {
@@ -3039,26 +2596,24 @@ var Deparser = /*#__PURE__*/function () {
     value: function ExclusionConstraint(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       function getExclusionGroup(nde) {
         var _this16 = this;
-
-        var a = nde.exclusions.map(function (excl) {
-          if (excl[0].IndexElem.name) {
-            return excl[0].IndexElem.name;
+        var exclusions = unwrapList(nde.exclusions);
+        var a = exclusions.map(function (excl) {
+          var firstExcl = unwrapList(excl)[0];
+          if (firstExcl.IndexElem.name) {
+            return firstExcl.IndexElem.name;
           }
-
-          return excl[0].IndexElem.expr ? _this16.deparse(excl[0].IndexElem.expr, context) : null;
+          return firstExcl.IndexElem.expr ? _this16.deparse(firstExcl.IndexElem.expr, context) : null;
         });
-        var b = nde.exclusions.map(function (excl) {
-          return _this16.deparse(excl[1][0], context);
+        var b = exclusions.map(function (excl) {
+          return _this16.deparse(unwrapList(unwrapList(excl)[1])[0], context);
         });
         var stmts = a.map(function (_v, i) {
           return "".concat(a[i], " WITH ").concat(b[i]);
         });
         return stmts.join(', ');
       }
-
       if (node.exclusions && node.access_method) {
         output.push('USING');
         output.push(node.access_method);
@@ -3066,7 +2621,6 @@ var Deparser = /*#__PURE__*/function () {
         output.push(getExclusionGroup.call(this, node));
         output.push(')');
       }
-
       return output.join(' ');
     }
   }, {
@@ -3074,120 +2628,95 @@ var Deparser = /*#__PURE__*/function () {
     value: function Constraint(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.contype === 'CONSTR_FOREIGN') {
         output.push(this.ReferenceConstraint(node, context));
       } else {
         output.push(this.ConstraintStmt(node, context));
       }
-
       if (node.keys) {
         output.push('(');
         output.push(this.listQuotes(node.keys));
         output.push(')');
       }
-
       if (node.raw_expr) {
         output.push('(');
         output.push(this.deparse(node.raw_expr, context));
         output.push(')');
-
         if (node.contype == 'CONSTR_GENERATED') {
           output.push('STORED');
         }
       }
-
       if (node.fk_del_action) {
         switch (node.fk_del_action) {
           case 'r':
             output.push('ON DELETE RESTRICT');
             break;
-
           case 'c':
             output.push('ON DELETE CASCADE');
             break;
-
           case 'n':
             output.push('ON DELETE SET NULL');
             break;
-
           case 'd':
             output.push('ON DELETE SET DEFAULT');
             break;
-
           case 'a':
             // output.push('ON DELETE NO ACTION');
             break;
-
           default:
         }
       }
-
       if (node.fk_upd_action) {
         switch (node.fk_upd_action) {
           case 'r':
             output.push('ON UPDATE RESTRICT');
             break;
-
           case 'c':
             output.push('ON UPDATE CASCADE');
             break;
-
           case 'n':
             output.push('ON UPDATE SET NULL');
             break;
-
           case 'd':
             output.push('ON UPDATE SET DEFAULT');
             break;
-
           case 'a':
             // output.push('ON UPDATE NO ACTION');
             break;
-
           default:
         }
       }
-
       if (node.fk_matchtype === 'f') {
         output.push('MATCH FULL');
       }
-
       if (node.is_no_inherit === true) {
         output.push('NO INHERIT');
       }
-
       if (node.skip_validation === true) {
         output.push('NOT VALID');
       }
-
       if (node.contype === 'CONSTR_EXCLUSION') {
         output.push(this.ExclusionConstraint(node, context));
       }
-
       if (node.deferrable) {
         output.push('deferrable');
       }
-
       return output.join(' ');
     }
   }, {
     key: 'AccessPriv',
     value: function AccessPriv(node) {
       var output = [];
-
       if (node.priv_name) {
         output.push(node.priv_name.toUpperCase());
       } else {
         output.push('ALL');
       }
-
       if (node.cols) {
         output.push('(');
         output.push(this.listQuotes(node.cols));
         output.push(')');
       }
-
       return output.join(' ');
     }
   }, {
@@ -3196,13 +2725,10 @@ var Deparser = /*#__PURE__*/function () {
       switch (node.kind) {
         case 'VAR_SET_VALUE':
           return (0, _util.format)('SET %s%s = %s', node.is_local ? 'LOCAL ' : '', node.name, this.deparseNodes(node.args, 'simple').join(', '));
-
         case 'VAR_SET_DEFAULT':
           return (0, _util.format)('SET %s TO DEFAULT', node.name);
-
         case 'VAR_SET_CURRENT':
           return (0, _util.format)('SET %s FROM CURRENT', node.name);
-
         case 'VAR_SET_MULTI':
           {
             var name = {
@@ -3211,13 +2737,10 @@ var Deparser = /*#__PURE__*/function () {
             }[node.name];
             return (0, _util.format)('SET %s %s', name, this.deparseNodes(node.args, 'simple').join(', '));
           }
-
         case 'VAR_RESET':
           return (0, _util.format)('RESET %s', node.name);
-
         case 'VAR_RESET_ALL':
           return 'RESET ALL';
-
         default:
           return fail('VariableSetKind', node);
       }
@@ -3232,7 +2755,7 @@ var Deparser = /*#__PURE__*/function () {
     value: function FuncWithArgs(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-      output.push(this.deparse(node.funcname[0], context));
+      output.push(this.deparse(unwrapList(node.funcname)[0], context));
       output.push('(');
       output.push(this.list(node.funcargs, ', ', '', context));
       output.push(')');
@@ -3243,53 +2766,42 @@ var Deparser = /*#__PURE__*/function () {
     value: function FunctionParameter(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (node.mode === 'FUNC_PARAM_VARIADIC') {
         output.push('VARIADIC');
       }
-
       if (node.mode === 'FUNC_PARAM_OUT') {
         output.push('OUT');
       }
-
       if (node.mode === 'FUNC_PARAM_INOUT') {
         output.push('INOUT');
       }
-
       output.push(node.name);
       output.push(this.TypeName(node.argType, context));
-
       if (node.defexpr) {
         output.push('DEFAULT');
         output.push(this.deparse(node.defexpr, context));
       }
-
       return output.join(' ');
     }
   }, {
     key: 'CreateFunctionStmt',
     value: function CreateFunctionStmt(node) {
       var _this17 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('CREATE');
-
       if (node.replace) {
         output.push('OR REPLACE');
       }
-
       output.push('FUNCTION');
-      output.push(node.funcname.map(function (name) {
+      output.push(unwrapList(node.funcname).map(function (name) {
         return _this17.deparse(name, context);
       }).join('.'));
       output.push('(');
       var parameters = [];
-
       if (node.parameters) {
-        parameters = (0, _toConsumableArray2["default"])(node.parameters);
+        parameters = unwrapList(node.parameters);
       }
-
       var parametersList = parameters.filter(function (_ref2) {
         var FunctionParameter = _ref2.FunctionParameter;
         return FunctionParameter.mode === 'FUNC_PARAM_VARIADIC' || FunctionParameter.mode === 'FUNC_PARAM_OUT' || FunctionParameter.mode === 'FUNC_PARAM_INOUT' || FunctionParameter.mode === 'FUNC_PARAM_IN';
@@ -3300,7 +2812,6 @@ var Deparser = /*#__PURE__*/function () {
         var FunctionParameter = _ref3.FunctionParameter;
         return FunctionParameter.mode === 'FUNC_PARAM_TABLE';
       });
-
       if (returns.length > 0) {
         output.push('RETURNS');
         output.push('TABLE');
@@ -3311,73 +2822,55 @@ var Deparser = /*#__PURE__*/function () {
         output.push('RETURNS');
         output.push(this.TypeName(node.returnType, context));
       }
-
       node.options.forEach(function (option, i) {
         if (option && option.DefElem) {
           var value = '';
-
           switch (option.DefElem.defname) {
             case 'as':
-              value = _this17.deparse(option.DefElem.arg[0], context);
+              value = _this17.deparse(unwrapList(option.DefElem.arg)[0], context);
               output.push("AS $EOFCODE$".concat(value, "$EOFCODE$"));
               break;
-
             case 'language':
               value = _this17.deparse(option.DefElem.arg, context);
               output.push('LANGUAGE');
               output.push(value);
               break;
-
             case 'security':
               output.push('SECURITY');
               value = Number(option.DefElem.arg.Integer.ival);
-
               if (value > 0) {
                 output.push('DEFINER');
               } else {
                 output.push('INVOKER');
               }
-
               break;
-
             case 'leakproof':
               value = Number(option.DefElem.arg.Integer.ival);
-
               if (value > 0) {
                 output.push('LEAKPROOF');
               }
-
               break;
-
             case 'window':
               value = Number(option.DefElem.arg.Integer.ival);
-
               if (value > 0) {
                 output.push('WINDOW');
               }
-
               break;
-
             case 'strict':
               value = Number(option.DefElem.arg.Integer.ival);
-
               if (value > 0) {
                 output.push('STRICT');
               } else {
                 output.push('CALLED ON NULL INPUT');
               }
-
               break;
-
             case 'set':
               output.push(_this17.deparse(option, context));
               break;
-
             case 'volatility':
               value = _this17.deparse(option.DefElem.arg, context);
               output.push(value.toUpperCase());
               break;
-
             default:
           }
         }
@@ -3389,17 +2882,13 @@ var Deparser = /*#__PURE__*/function () {
     value: function CreateSchemaStmt(node) {
       var output = [];
       output.push('CREATE');
-
       if (node.replace) {
         output.push('OR REPLACE');
       }
-
       output.push('SCHEMA');
-
       if (node.if_not_exists) {
         output.push('IF NOT EXISTS');
       }
-
       output.push(node.schemaname);
       return output.join(' ');
     }
@@ -3409,16 +2898,12 @@ var Deparser = /*#__PURE__*/function () {
       switch (node.roletype) {
         case 'ROLESPEC_CSTRING':
           return this.quote(node.rolename);
-
         case 'ROLESPEC_CURRENT_USER':
           return 'CURRENT_USER';
-
         case 'ROLESPEC_SESSION_USER':
           return 'SESSION_USER';
-
         case 'ROLESPEC_PUBLIC':
           return 'PUBLIC';
-
         default:
           return fail('RoleSpec', node);
       }
@@ -3427,91 +2912,67 @@ var Deparser = /*#__PURE__*/function () {
     key: 'GrantStmt',
     value: function GrantStmt(node) {
       var output = [];
-
       var getTypeFromNode = function getTypeFromNode(nodeObj) {
         switch (nodeObj.objtype) {
           case 'OBJECT_TABLE':
             if (nodeObj.targtype === 'ACL_TARGET_ALL_IN_SCHEMA') {
               return 'ALL TABLES IN SCHEMA';
             }
-
             if (nodeObj.targtype === 'ACL_TARGET_DEFAULTS') {
               return 'TABLES';
-            } // todo could be view
-
-
+            }
+            // todo could be view
             return 'TABLE';
-
           case 'OBJECT_SEQUENCE':
             if (nodeObj.targtype === 'ACL_TARGET_ALL_IN_SCHEMA') {
               return 'ALL SEQUENCES IN SCHEMA';
             }
-
             if (nodeObj.targtype === 'ACL_TARGET_DEFAULTS') {
               return 'SEQUENCES';
             }
-
             return 'SEQUENCE';
-
           case 'OBJECT_DATABASE':
             return 'DATABASE';
-
           case 'OBJECT_DOMAIN':
             return 'DOMAIN';
-
           case 'OBJECT_FDW':
             return 'FOREIGN DATA WRAPPER';
-
           case 'OBJECT_FOREIGN_SERVER':
             return 'FOREIGN SERVER';
-
           case 'OBJECT_FUNCTION':
             if (nodeObj.targtype === 'ACL_TARGET_ALL_IN_SCHEMA') {
               return 'ALL FUNCTIONS IN SCHEMA';
             }
-
             if (nodeObj.targtype === 'ACL_TARGET_DEFAULTS') {
               return 'FUNCTIONS';
             }
-
             return 'FUNCTION';
-
           case 'OBJECT_LANGUAGE':
             return 'LANGUAGE';
-
           case 'OBJECT_LARGEOBJECT':
             return 'LARGE OBJECT';
-
           case 'OBJECT_SCHEMA':
             return 'SCHEMA';
-
           case 'OBJECT_TABLESPACE':
             return 'TABLESPACE';
-
           case 'OBJECT_TYPE':
             return 'TYPE';
-
           default:
         }
-
         return fail('GrantStmt', node);
       };
-
       if (node.objtype !== 'OBJECT_COLUMN') {
         if (!node.is_grant) {
           output.push('REVOKE');
-
           if (node.grant_option) {
             output.push('GRANT OPTION');
             output.push('FOR');
           }
-
           if (node.privileges) {
             output.push(this.list(node.privileges));
           } else {
             output.push('ALL');
           }
-
           output.push('ON');
           output.push(getTypeFromNode(node));
           output.push(this.list(node.objects));
@@ -3519,29 +2980,24 @@ var Deparser = /*#__PURE__*/function () {
           output.push(this.list(node.grantees));
         } else {
           output.push('GRANT');
-
           if (node.privileges) {
             output.push(this.list(node.privileges));
           } else {
             output.push('ALL');
           }
-
           output.push('ON');
           output.push(getTypeFromNode(node));
           output.push(this.list(node.objects));
           output.push('TO');
           output.push(this.list(node.grantees));
-
           if (node.grant_option) {
             output.push('WITH GRANT OPTION');
           }
         }
-
         if (node.behavior === 'DROP_CASCADE') {
           output.push('CASCADE');
         }
       }
-
       return output.join(' ');
     }
   }, {
@@ -3549,7 +3005,6 @@ var Deparser = /*#__PURE__*/function () {
     value: function GrantRoleStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (!node.is_grant) {
         output.push('REVOKE');
         output.push(this.list(node.granted_roles, ', ', '', context));
@@ -3561,232 +3016,181 @@ var Deparser = /*#__PURE__*/function () {
         output.push('TO');
         output.push(this.list(node.grantee_roles, ', ', '', context));
       }
-
       if (node.admin_opt) {
         output.push('WITH ADMIN OPTION');
       }
-
       return output.join(' ');
     }
   }, {
     key: 'CreateRoleStmt',
     value: function CreateRoleStmt(node) {
       var _this18 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       var roleOption = function roleOption(nodeObj, i, val1, val2) {
-        var val = Number(dotty.get(nodeObj, "options.".concat(i, ".DefElem.arg.Integer.ival")));
-
+        var val = Number(dotty.get(unwrapList(nodeObj.options), "".concat(i, ".DefElem.arg.Integer.ival")));
         if (val > 0) {
           output.push(val1);
         } else {
           output.push(val2);
         }
       };
-
       output.push('CREATE');
-
       switch (node.stmt_type) {
         case 'ROLESTMT_USER':
           output.push('USER');
           break;
-
         case 'ROLESTMT_GROUP':
           output.push('GROUP');
           break;
-
         default:
           output.push('ROLE');
       }
-
       output.push("\"".concat(node.role, "\""));
-
       if (node.options) {
-        var opts = dotty.search(node, 'options.*.DefElem.defname');
-
-        if (opts.length === 1 && opts[0] === 'addroleto') {// only one case
+        var options = unwrapList(node.options);
+        var opts = dotty.search(options, '*.DefElem.defname');
+        if (opts.length === 1 && opts[0] === 'addroleto') {
+          // only one case
         } else {
           output.push('WITH');
         }
-
         opts.forEach(function (option, i) {
           var value = '';
-
           switch (option) {
             case 'canlogin':
               roleOption(node, i, 'LOGIN', 'NOLOGIN');
               break;
-
             case 'addroleto':
               output.push('IN ROLE');
-              output.push(dotty.search(node, "options.".concat(i, ".DefElem.arg.*.RoleSpec.rolename")).join(','));
+              output.push(dotty.search(flatten(dotty.search(options, "".concat(i, ".DefElem.arg")).map(unwrapList)), '*.RoleSpec.rolename').join(','));
               break;
-
             case 'password':
               output.push('PASSWORD');
-              value = dotty.get(node, "options.".concat(i, ".DefElem.arg.String.str"));
+              value = dotty.get(options, "".concat(i, ".DefElem.arg.String.str"));
               output.push("'".concat(value, "'"));
               break;
-
             case 'adminmembers':
               output.push('ADMIN');
-              output.push(_this18.list(node.options[i].DefElem.arg, ', ', '', context));
+              output.push(_this18.list(options[i].DefElem.arg, ', ', '', context));
               break;
-
             case 'rolemembers':
               output.push('USER');
-              output.push(_this18.list(node.options[i].DefElem.arg, ', ', '', context));
+              output.push(_this18.list(options[i].DefElem.arg, ', ', '', context));
               break;
-
             case 'createdb':
               roleOption(node, i, 'CREATEDB', 'NOCREATEDB');
               break;
-
             case 'isreplication':
               roleOption(node, i, 'REPLICATION', 'NOREPLICATION');
               break;
-
             case 'bypassrls':
               roleOption(node, i, 'BYPASSRLS', 'NOBYPASSRLS');
               break;
-
             case 'inherit':
               roleOption(node, i, 'INHERIT', 'NOINHERIT');
               break;
-
             case 'superuser':
               roleOption(node, i, 'SUPERUSER', 'NOSUPERUSER');
               break;
-
             case 'createrole':
               roleOption(node, i, 'CREATEROLE', 'NOCREATEROLE');
               break;
-
             case 'validUntil':
               output.push('VALID UNTIL');
-              value = dotty.get(node, "options.".concat(i, ".DefElem.arg.String.str"));
+              value = dotty.get(options[i], "DefElem.arg.String.str");
               output.push("'".concat(value, "'"));
               break;
-
             default:
           }
         });
       }
-
       return output.join(' ');
     }
   }, {
     key: 'TransactionStmt',
     value: function TransactionStmt(node) {
       var _this19 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       var begin = function begin(nodeOpts) {
-        var opts = dotty.search(nodeOpts, 'options.*.DefElem.defname');
-
+        var options = unwrapList(nodeOpts.options);
+        var opts = options ? dotty.search(options, '*.DefElem.defname') : [];
         if (opts.includes('transaction_read_only')) {
           var index = opts.indexOf('transaction_read_only');
-          var obj = nodeOpts.options[index];
+          var obj = options[index];
           var set = false;
           var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
-
           if (flag > 0) {
             set = true;
           }
-
           if (set) {
             return 'BEGIN TRANSACTION READ ONLY';
           }
-
           return 'BEGIN TRANSACTION READ WRITE';
         }
-
         if (opts.includes('transaction_isolation')) {
           var _index = opts.indexOf('transaction_isolation');
-
-          var _obj = nodeOpts.options[_index];
-
+          var _obj = options[_index];
           var lopts = _this19.deparse(dotty.get(_obj, 'DefElem.arg'), context).replace(/['"]+/g, '');
-
           return "BEGIN TRANSACTION ISOLATION LEVEL ".concat(lopts.toUpperCase());
         }
-
         return 'BEGIN';
       };
-
       var start = function start(nodeOpts) {
-        var opts = dotty.search(nodeOpts, 'options.*.DefElem.defname');
-
+        var options = unwrapList(nodeOpts.options);
+        var opts = options ? dotty.search(options, '*.DefElem.defname') : [];
         if (opts.includes('transaction_read_only')) {
           var index = opts.indexOf('transaction_read_only');
-          var obj = nodeOpts.options[index];
+          var obj = options[index];
           var set = false;
           var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
-
           if (flag > 0) {
             set = true;
           }
-
           if (set) {
             return 'START TRANSACTION READ ONLY';
           }
-
           return 'START TRANSACTION READ WRITE';
         }
-
         return 'START TRANSACTION';
       };
-
+      var nodeOptions = unwrapList(node.options);
       switch (node.kind) {
         case 'TRANS_STMT_BEGIN':
           return begin(node);
-
         case 'TRANS_STMT_START':
           return start(node);
-
         case 'TRANS_STMT_COMMIT':
           return 'COMMIT';
-
         case 'TRANS_STMT_ROLLBACK':
           return 'ROLLBACK';
-
         case 'TRANS_STMT_SAVEPOINT':
           output.push('SAVEPOINT');
-          output.push(this.deparse(node.options[0].DefElem.arg, context));
+          output.push(this.deparse(nodeOptions[0].DefElem.arg, context));
           break;
-
         case 'TRANS_STMT_RELEASE':
           output.push('RELEASE SAVEPOINT');
-          output.push(this.deparse(node.options[0].DefElem.arg, context));
+          output.push(this.deparse(nodeOptions[0].DefElem.arg, context));
           break;
-
         case 'TRANS_STMT_ROLLBACK_TO':
           output.push('ROLLBACK TO');
-          output.push(this.deparse(node.options[0].DefElem.arg, context));
+          output.push(this.deparse(nodeOptions[0].DefElem.arg, context));
           break;
-
         case 'TRANS_STMT_PREPARE':
           output.push('PREPARE TRANSACTION');
           output.push("'".concat(node.gid, "'"));
           break;
-
         case 'TRANS_STMT_COMMIT_PREPARED':
           output.push('COMMIT PREPARED');
           output.push("'".concat(node.gid, "'"));
           break;
-
         case 'TRANS_STMT_ROLLBACK_PREPARED':
           output.push('ROLLBACK PREPARED');
           output.push("'".concat(node.gid, "'"));
           break;
-
         default:
       }
-
       return output.join(' ');
     }
   }, {
@@ -3795,65 +3199,53 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push(this.deparse(node.node, context));
-
       switch (node.sortby_dir) {
         case 'SORTBY_ASC':
           output.push('ASC');
           break;
-
         case 'SORTBY_DESC':
           output.push('DESC');
           break;
-
         case 'SORTBY_USING':
           output.push("USING ".concat(this.deparseNodes(node.useOp, context)));
           break;
-
         case 'SORTBY_DEFAULT':
           break;
-
         default:
           return fail('SortBy', node);
       }
-
       if (node.sortby_nulls === 'SORTBY_NULLS_FIRST') {
         output.push('NULLS FIRST');
       }
-
       if (node.sortby_nulls === 'SORTBY_NULLS_LAST') {
         output.push('NULLS LAST');
       }
-
       return output.join(' ');
     }
   }, {
     key: 'ObjectWithArgs',
     value: function ObjectWithArgs(node) {
       var _this20 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (context === 'noquotes') {
         output.push(this.list(node.objname, ', ', '', context));
       } else {
         output.push(this.listQuotes(node.objname, '.'));
       }
-
-      if (node.objargs && node.objargs.length) {
+      var objargs = unwrapList(node.objargs);
+      if (objargs && objargs.length) {
         output.push('(');
-        output.push(node.objargs.map(function (arg) {
+        output.push(objargs.map(function (arg) {
           if (isEmptyObject(arg)) {
             return 'NONE';
           }
-
           return _this20.deparse(arg, context);
         }).join(','));
         output.push(')');
       } else if (!node.args_unspecified) {
         output.push('()');
       }
-
       return output.join(' ');
     }
   }, {
@@ -3865,35 +3257,26 @@ var Deparser = /*#__PURE__*/function () {
     key: 'SubLink',
     value: function SubLink(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       switch (true) {
         case node.subLinkType === 'EXISTS_SUBLINK':
           return (0, _util.format)('EXISTS (%s)', this.deparse(node.subselect, context));
-
         case node.subLinkType === 'ALL_SUBLINK':
           return (0, _util.format)('%s %s ALL (%s)', this.deparse(node.testexpr, context), this.deparse(node.operName[0], context), this.deparse(node.subselect, context));
-
         case node.subLinkType === 'ANY_SUBLINK' && !(node.operName != null):
           return (0, _util.format)('%s IN (%s)', this.deparse(node.testexpr, context), this.deparse(node.subselect, context));
-
         case node.subLinkType === 'ANY_SUBLINK':
           return (0, _util.format)('%s %s ANY (%s)', this.deparse(node.testexpr, context), this.deparse(node.operName[0], context), this.deparse(node.subselect, context));
-
         case node.subLinkType === 'ROWCOMPARE_SUBLINK':
           return (0, _util.format)('%s %s (%s)', this.deparse(node.testexpr, context), this.deparse(node.operName[0], context), this.deparse(node.subselect, context));
-
         case node.subLinkType === 'EXPR_SUBLINK':
           return (0, _util.format)('(%s)', this.deparse(node.subselect, context));
-
         case node.subLinkType === 'MULTIEXPR_SUBLINK':
           // TODO(zhm) what is this?
           return fail('SubLink', node);
         // MULTIEXPR_SUBLINK
         // format('(%s)', @deparse(node.subselect))
-
         case node.subLinkType === 'ARRAY_SUBLINK':
           return (0, _util.format)('ARRAY (%s)', this.deparse(node.subselect, context));
-
         default:
           return fail('SubLink', node);
       }
@@ -3904,57 +3287,44 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var type = this.TypeName(node.typeName, context);
       var arg = this.deparse(node.arg, context);
-
-      if (dotty.exists(node, 'arg.A_Expr')) {
+      if (node.arg !== undefined && node.arg.A_Expr !== undefined) {
         arg = (0, _util.format)('(%s)', arg);
       }
-
       if (type === 'boolean') {
         var value = dotty.get(node, 'arg.A_Const.val.String.str');
-
         if (value === 'f') {
           return 'FALSE';
         }
-
         if (value === 't') {
           return 'TRUE';
         }
       }
-
       return (0, _util.format)('%s::%s', arg, type);
     }
   }, {
     key: 'TypeName',
     value: function TypeName(node) {
       var _this21 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-      if (_lodash["default"].last(node.names).String.str === 'interval') {
+      var names = unwrapList(node.names);
+      if (names[names.length - 1].String.str === 'interval') {
         return this.deparseInterval(node);
       }
-
       var output = [];
-
       if (node.setof) {
         output.push('SETOF');
       }
-
       var args = null;
-
       if (node.typmods != null) {
-        args = node.typmods.map(function (item) {
+        args = unwrapList(node.typmods).map(function (item) {
           return _this21.deparse(item, context);
         });
       }
-
       var type = [];
-      type.push(this.type(node.names, args && args.join(', ')));
-
+      type.push(this.type(names, args && args.join(', ')));
       if (node.arrayBounds != null) {
         type.push('[]');
       }
-
       output.push(type.join(''));
       return output.join(' ');
     }
@@ -3972,54 +3342,44 @@ var Deparser = /*#__PURE__*/function () {
     key: 'WindowDef',
     value: function WindowDef(node) {
       var _this22 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
-
       if (context !== 'window') {
         if (node.name) {
           output.push(node.name);
         }
       }
-
       var empty = !(node.partitionClause != null) && !(node.orderClause != null);
       var frameOptions = this.deparseFrameOptions(node.frameOptions, node.refname, node.startOffset, node.endOffset);
-
       if (empty && context !== 'window' && !(node.name != null) && frameOptions.length === 0) {
         return '()';
       }
-
       var windowParts = [];
       var useParens = false;
-
       if (node.partitionClause) {
         var partition = ['PARTITION BY'];
-        var clause = node.partitionClause.map(function (item) {
+        var clause = unwrapList(node.partitionClause).map(function (item) {
           return _this22.deparse(item, context);
         });
         partition.push(clause.join(', '));
         windowParts.push(partition.join(' '));
         useParens = true;
       }
-
       if (node.orderClause) {
         windowParts.push('ORDER BY');
-        var orders = node.orderClause.map(function (item) {
+        var orders = unwrapList(node.orderClause).map(function (item) {
           return _this22.deparse(item);
         });
         windowParts.push(orders.join(', '));
         useParens = true;
       }
-
       if (frameOptions.length) {
         useParens = true;
         windowParts.push(frameOptions);
       }
-
       if (useParens && context !== 'window') {
         return output.join(' ') + ' (' + windowParts.join(' ') + ')';
       }
-
       return output.join(' ') + windowParts.join(' ');
     }
   }, {
@@ -4027,29 +3387,24 @@ var Deparser = /*#__PURE__*/function () {
     value: function WithClause(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = ['WITH'];
-
       if (node.recursive) {
         output.push('RECURSIVE');
       }
-
       output.push(this.list(node.ctes, ', ', '', context));
       return output.join(' ');
     }
   }, {
     key: 'CopyStmt',
     value: function CopyStmt(node) {
-      var _node$options;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = ['COPY'];
       output.push('(' + this.deparse(node.query, context) + ')');
       output.push('TO');
       output.push("'".concat(node.filename, "'"));
-
-      if (((_node$options = node.options) === null || _node$options === void 0 ? void 0 : _node$options.length) > 0 && node.options[0].DefElem.defname === 'format') {
-        output.push("(FORMAT '".concat(this.deparse(node.options[0].DefElem.arg), "')"));
+      var options = unwrapList(node.options);
+      if ((options === null || options === void 0 ? void 0 : options.length) > 0 && options[0].DefElem.defname === 'format') {
+        output.push("(FORMAT '".concat(this.deparse(options[0].DefElem.arg), "')"));
       }
-
       return output.join(' ');
     }
   }, {
@@ -4057,75 +3412,40 @@ var Deparser = /*#__PURE__*/function () {
     value: function CallStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = ['CALL'];
-      output.push(this.deparse(node.funccall.funcname[0]));
-
-      if (node.funccall.args && node.funccall.args.length) {
+      output.push(this.deparse(unwrapList(node.funccall.funcname)[0]));
+      var funccallArgs = unwrapList(node.funccall.args);
+      if (funccallArgs && funccallArgs.length) {
         // we have arguments
-        output.push('(' + this.list(node.funccall.args, ', ', '', context) + ')');
+        output.push('(' + this.list(funccallArgs, ', ', '', context) + ')');
       } else {
         // just close parens
         output.push('()');
       }
-
       return output.join(' ');
     }
   }, {
     key: "deparseFrameOptions",
     value: function deparseFrameOptions(options, refName, startOffset, endOffset) {
       // https://github.com/pganalyze/libpg_query/blob/442b1748d06364ecd3779bc558899176c02efaf0/src/postgres/include/nodes/parsenodes.h#L505-L522
-      var FRAMEOPTION_NONDEFAULT = 0x00001;
-      /* any specified? */
-
-      var FRAMEOPTION_RANGE = 0x00002;
-      /* RANGE behavior */
-
-      var FRAMEOPTION_ROWS = 0x00004;
-      /* ROWS behavior */
-
-      var FRAMEOPTION_GROUPS = 0x00008;
-      /* GROUPS behavior */
-
-      var FRAMEOPTION_BETWEEN = 0x00010;
-      /* BETWEEN given? */
-
-      var FRAMEOPTION_START_UNBOUNDED_PRECEDING = 0x00020;
-      /* start is U. P. */
-
-      var FRAMEOPTION_END_UNBOUNDED_PRECEDING = 0x00040;
-      /* (disallowed) */
-
-      var FRAMEOPTION_START_UNBOUNDED_FOLLOWING = 0x00080;
-      /* (disallowed) */
-
-      var FRAMEOPTION_END_UNBOUNDED_FOLLOWING = 0x00100;
-      /* end is U. F. */
-
-      var FRAMEOPTION_START_CURRENT_ROW = 0x00200;
-      /* start is C. R. */
-
-      var FRAMEOPTION_END_CURRENT_ROW = 0x00400;
-      /* end is C. R. */
+      var FRAMEOPTION_NONDEFAULT = 0x00001; /* any specified? */
+      var FRAMEOPTION_RANGE = 0x00002; /* RANGE behavior */
+      var FRAMEOPTION_ROWS = 0x00004; /* ROWS behavior */
+      var FRAMEOPTION_GROUPS = 0x00008; /* GROUPS behavior */
+      var FRAMEOPTION_BETWEEN = 0x00010; /* BETWEEN given? */
+      var FRAMEOPTION_START_UNBOUNDED_PRECEDING = 0x00020; /* start is U. P. */
+      var FRAMEOPTION_END_UNBOUNDED_PRECEDING = 0x00040; /* (disallowed) */
+      var FRAMEOPTION_START_UNBOUNDED_FOLLOWING = 0x00080; /* (disallowed) */
+      var FRAMEOPTION_END_UNBOUNDED_FOLLOWING = 0x00100; /* end is U. F. */
+      var FRAMEOPTION_START_CURRENT_ROW = 0x00200; /* start is C. R. */
+      var FRAMEOPTION_END_CURRENT_ROW = 0x00400; /* end is C. R. */
+      var FRAMEOPTION_START_OFFSET_PRECEDING = 0x00800; /* start is O. P. */
+      var FRAMEOPTION_END_OFFSET_PRECEDING = 0x01000; /* end is O. P. */
+      var FRAMEOPTION_START_OFFSET_FOLLOWING = 0x02000; /* start is O. F. */
+      var FRAMEOPTION_END_OFFSET_FOLLOWING = 0x04000; /* end is O. F. */
+      var FRAMEOPTION_EXCLUDE_CURRENT_ROW = 0x08000; /* omit C.R. */
+      var FRAMEOPTION_EXCLUDE_GROUP = 0x10000; /* omit C.R. & peers */
+      var FRAMEOPTION_EXCLUDE_TIES = 0x20000; /* omit C.R.'s peers */
 
-      var FRAMEOPTION_START_OFFSET_PRECEDING = 0x00800;
-      /* start is O. P. */
-
-      var FRAMEOPTION_END_OFFSET_PRECEDING = 0x01000;
-      /* end is O. P. */
-
-      var FRAMEOPTION_START_OFFSET_FOLLOWING = 0x02000;
-      /* start is O. F. */
-
-      var FRAMEOPTION_END_OFFSET_FOLLOWING = 0x04000;
-      /* end is O. F. */
-
-      var FRAMEOPTION_EXCLUDE_CURRENT_ROW = 0x08000;
-      /* omit C.R. */
-
-      var FRAMEOPTION_EXCLUDE_GROUP = 0x10000;
-      /* omit C.R. & peers */
-
-      var FRAMEOPTION_EXCLUDE_TIES = 0x20000;
-      /* omit C.R.'s peers */
       // const FRAMEOPTION_START_OFFSET =
       //   FRAMEOPTION_START_OFFSET_PRECEDING | FRAMEOPTION_START_OFFSET_FOLLOWING;
       // const FRAMEOPTION_END_OFFSET =
@@ -4134,6 +3454,7 @@ var Deparser = /*#__PURE__*/function () {
       //   FRAMEOPTION_EXCLUDE_CURRENT_ROW |
       //   FRAMEOPTION_EXCLUDE_GROUP |
       //   FRAMEOPTION_EXCLUDE_TIES;
+
       // const FRAMEOPTION_DEFAULTS =
       //   FRAMEOPTION_RANGE |
       //   FRAMEOPTION_START_UNBOUNDED_PRECEDING |
@@ -4142,105 +3463,83 @@ var Deparser = /*#__PURE__*/function () {
       if (!(options & FRAMEOPTION_NONDEFAULT)) {
         return '';
       }
-
       var output = [];
-
       if (refName != null) {
         output.push(refName);
       }
-
       if (options & FRAMEOPTION_RANGE) {
         output.push('RANGE');
       }
-
       if (options & FRAMEOPTION_ROWS) {
         output.push('ROWS');
       }
-
       var between = options & FRAMEOPTION_BETWEEN;
-
       if (between) {
         output.push('BETWEEN');
       }
-
       if (options & FRAMEOPTION_START_UNBOUNDED_PRECEDING) {
         output.push('UNBOUNDED PRECEDING');
       }
-
       if (options & FRAMEOPTION_START_UNBOUNDED_FOLLOWING) {
         output.push('UNBOUNDED FOLLOWING');
       }
-
       if (options & FRAMEOPTION_START_CURRENT_ROW) {
         output.push('CURRENT ROW');
       }
-
       if (options & FRAMEOPTION_START_OFFSET_PRECEDING) {
         output.push(this.deparse(startOffset) + ' PRECEDING');
       }
-
       if (options & FRAMEOPTION_START_OFFSET_FOLLOWING) {
         output.push(this.deparse(startOffset) + ' FOLLOWING');
       }
-
       if (between) {
         output.push('AND');
-
         if (options & FRAMEOPTION_END_UNBOUNDED_PRECEDING) {
           output.push('UNBOUNDED PRECEDING');
         }
-
         if (options & FRAMEOPTION_END_UNBOUNDED_FOLLOWING) {
           output.push('UNBOUNDED FOLLOWING');
         }
-
         if (options & FRAMEOPTION_END_CURRENT_ROW) {
           output.push('CURRENT ROW');
         }
-
         if (options & FRAMEOPTION_END_OFFSET_PRECEDING) {
           output.push(this.deparse(endOffset) + ' PRECEDING');
         }
-
         if (options & FRAMEOPTION_END_OFFSET_FOLLOWING) {
           output.push(this.deparse(endOffset) + ' FOLLOWING');
         }
       }
-
       return output.join(' ');
     }
   }, {
     key: "deparseInterval",
     value: function deparseInterval(node) {
       var _this23 = this;
-
       var type = ['interval'];
-
       if (node.arrayBounds != null) {
         type.push('[]');
       }
-
       if (node.typmods) {
-        var typmods = node.typmods.map(function (item) {
+        var nodeTypmods = unwrapList(node.typmods);
+        var typmods = nodeTypmods.map(function (item) {
           return _this23.deparse(item);
         });
-        var intervals = this.interval(typmods[0]); // SELECT interval(0) '1 day 01:23:45.6789'
+        var intervals = this.interval(typmods[0]);
 
-        if (node.typmods[0] && node.typmods[0].A_Const && node.typmods[0].A_Const.val.Integer.ival === 32767 && node.typmods[1] && node.typmods[1].A_Const != null) {
-          intervals = ["(".concat(node.typmods[1].A_Const.val.Integer.ival, ")")];
+        // SELECT interval(0) '1 day 01:23:45.6789'
+        if (nodeTypmods[0] && nodeTypmods[0].A_Const && nodeTypmods[0].A_Const.val.Integer.ival === 32767 && nodeTypmods[1] && nodeTypmods[1].A_Const != null) {
+          intervals = ["(".concat(nodeTypmods[1].A_Const.val.Integer.ival, ")")];
         } else {
-          intervals = intervals.map(function (part) {
+          intervals = unwrapList(intervals).map(function (part) {
             if (part === 'second' && typmods.length === 2) {
-              return 'second(' + _lodash["default"].last(typmods) + ')';
+              return 'second(' + typmods[typmods.length - 1] + ')';
             }
-
             return part;
           });
         }
-
         type.push(intervals.join(' to '));
       }
-
       return type.join(' ');
     }
   }, {
@@ -4280,11 +3579,9 @@ var Deparser = /*#__PURE__*/function () {
           28: 'DTZMOD'
         };
       }
-
       if (this.BITS == null) {
-        this.BITS = _lodash["default"].invert(this.MASKS);
+        this.BITS = inverted(this.MASKS);
       }
-
       if (this.INTERVALS == null) {
         this.INTERVALS = {};
         this.INTERVALS[1 << this.BITS.YEAR] = ['year'];
@@ -4299,12 +3596,12 @@ var Deparser = /*#__PURE__*/function () {
         this.INTERVALS[1 << this.BITS.DAY | 1 << this.BITS.HOUR | 1 << this.BITS.MINUTE | 1 << this.BITS.SECOND] = ['day', 'second'];
         this.INTERVALS[1 << this.BITS.HOUR | 1 << this.BITS.MINUTE] = ['hour', 'minute'];
         this.INTERVALS[1 << this.BITS.HOUR | 1 << this.BITS.MINUTE | 1 << this.BITS.SECOND] = ['hour', 'second'];
-        this.INTERVALS[1 << this.BITS.MINUTE | 1 << this.BITS.SECOND] = ['minute', 'second']; // utils/timestamp.h
-        // #define INTERVAL_FULL_RANGE (0x7FFF)
+        this.INTERVALS[1 << this.BITS.MINUTE | 1 << this.BITS.SECOND] = ['minute', 'second'];
 
+        // utils/timestamp.h
+        // #define INTERVAL_FULL_RANGE (0x7FFF)
         this.INTERVALS[this.INTERVAL_FULL_RANGE = '32767'] = [];
       }
-
       return this.INTERVALS[mask.toString()];
     }
   }], [{
@@ -4315,5 +3612,4 @@ var Deparser = /*#__PURE__*/function () {
   }]);
   return Deparser;
 }();
-
 exports["default"] = Deparser;