pgsql-deparser 13.3.15 → 13.4.0

package/module/index.js

@@ -1,4 +1,3 @@
 import Deparser from './deparser';
-import { preparse } from './preparse';
 const deparse = Deparser.deparse;
-export { deparse, Deparser, preparse };
+export { deparse, Deparser };

package/module/utils/index.js

@@ -1,36 +1,34 @@
 /* eslint-disable no-restricted-syntax */
+
 export const cleanLines = sql => {
   return sql.split('\n').map(l => l.trim()).filter(a => a).join('\n');
 };
 export const transform = (obj, props) => {
-  let copy = null; // Handle the 3 simple types, and null or undefined
-
+  let copy = null;
+  // Handle the 3 simple types, and null or undefined
   if (obj == null || typeof obj !== 'object') {
     return obj;
-  } // Handle Date
-
+  }
 
+  // Handle Date
   if (obj instanceof Date) {
     copy = new Date();
     copy.setTime(obj.getTime());
     return copy;
-  } // Handle Array
-
+  }
 
+  // Handle Array
   if (obj instanceof Array) {
     copy = [];
-
     for (let i = 0, len = obj.length; i < len; i++) {
       copy[i] = transform(obj[i], props);
     }
-
     return copy;
-  } // Handle Object
-
+  }
 
+  // Handle Object
   if (obj instanceof Object || typeof obj === 'object') {
     copy = {};
-
     for (const attr in obj) {
       if (obj.hasOwnProperty(attr)) {
         if (props.hasOwnProperty(attr)) {
@@ -48,15 +46,11 @@ export const transform = (obj, props) => {
         copy[attr] = transform(obj[attr], props);
       }
     }
-
     return copy;
   }
-
   throw new Error("Unable to copy obj! Its type isn't supported.");
 };
-
 const noop = () => undefined;
-
 export const cleanTree = tree => {
   return transform(tree, {
     stmt_len: noop,
@@ -74,7 +68,6 @@ export const cleanTree = tree => {
           // do stmt
           obj.arg.String.str = obj.arg.String.str.trim();
         }
-
         return cleanTree(obj);
       } else {
         return cleanTree(obj);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "13.3.15",
+  "version": "13.4.0",
   "description": "PostgreSQL AST Deparser",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/pgsql-parser",
@@ -65,15 +65,14 @@
     "eslint-plugin-prettier": "^3.1.2",
     "glob": "7.1.6",
     "jest": "^25.1.0",
-    "pgsql-parser": "^13.4.1",
+    "pgsql-parser": "^13.5.0",
     "prettier": "^2.1.2",
     "regenerator-runtime": "^0.13.2"
   },
   "dependencies": {
     "@babel/runtime": "^7.11.2",
     "dotty": "^0.1.0",
-    "lodash": "^4.17.20",
     "pgsql-enums": "^13.1.3"
   },
-  "gitHead": "f2353fb8a98b0ac1d637c57d2c8be79f5495b446"
+  "gitHead": "3d78dc66d800eb8cdf76851337f27b972160fb41"
 }

package/main/preparse.js

@@ -1,142 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.transformArrays = exports.preparse = void 0;
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-/* eslint-disable no-restricted-syntax */
-// import { getEnum, nodes, toStr, toInt } from 'pgsql-enums';
-// NOTE: this is used to get rid of List.items... and use Arrays
-var preparse = function preparse(tree) {
-  return transformArrays(tree);
-}; // export const transform = (obj, context) => {
-//   let copy = null;
-//   // Handle null or undefined
-//   if (obj == null) {
-//     return obj;
-//   }
-//   // Handle the 3 simple types
-//   if (typeof obj !== 'object') {
-//     // if (context.enum) {
-//     //   return toInt[context.enum][obj];
-//     //   return obj;
-//     // } else {
-//     return obj;
-//     // }
-//   }
-//   // Handle Date
-//   if (obj instanceof Date) {
-//     copy = new Date();
-//     copy.setTime(obj.getTime());
-//     return copy;
-//   }
-//   // Handle Array
-//   if (obj instanceof Array) {
-//     copy = [];
-//     for (let i = 0, len = obj.length; i < len; i++) {
-//       copy[i] = transform(obj[i], context);
-//     }
-//     return copy;
-//   }
-//   // Handle Object
-//   if (obj instanceof Object || typeof obj === 'object') {
-//     copy = {};
-//     for (const attr in obj) {
-//       // IF IS AST NODE
-//       if (nodes.hasOwnProperty(attr)) {
-//         context = { node: attr };
-//         copy[attr] = transform(obj[attr], context);
-//       } else {
-//         // MUST BE A FIELD
-//         if (context && context.node) {
-//           const attrSchema = nodes[context.node][attr];
-//           if (attrSchema?.enum) {
-//             copy[attr] = transform(obj[attr], {
-//               enum: attrSchema.type
-//             });
-//           } else if (nodes.hasOwnProperty(attrSchema?.type)) {
-//             if (attrSchema.type === 'Expr') {
-//               copy[attr] = transform(obj[attr], {
-//                 node: attrSchema.type
-//               });
-//             } else {
-//               copy[attr] = {
-//                 [attrSchema.type]: transform(obj[attr], {
-//                   node: attrSchema.type
-//                 })
-//               };
-//             }
-//           } else {
-//             copy[attr] = transform(obj[attr], context);
-//           }
-//         } else {
-//           copy[attr] = transform(obj[attr], context);
-//         }
-//       }
-//     }
-//     return copy;
-//   }
-//   throw new Error("Unable to copy obj! Its type isn't supported.");
-// };
-
-
-exports.preparse = preparse;
-
-var transformArrays = function transformArrays(obj, context) {
-  var copy = null; // Handle null or undefined
-
-  if (obj == null) {
-    return obj;
-  } // Handle the 3 simple types
-
-
-  if ((0, _typeof2["default"])(obj) !== 'object') {
-    return obj;
-  } // Handle Date
-
-
-  if (obj instanceof Date) {
-    copy = new Date();
-    copy.setTime(obj.getTime());
-    return copy;
-  } // Handle Array
-
-
-  if (obj instanceof Array) {
-    copy = [];
-
-    for (var i = 0, len = obj.length; i < len; i++) {
-      copy[i] = transformArrays(obj[i], context);
-    }
-
-    return copy;
-  } // Handle Object
-
-
-  if (obj instanceof Object || (0, _typeof2["default"])(obj) === 'object') {
-    copy = {};
-
-    for (var attr in obj) {
-      if (attr === 'List') {
-        copy = [];
-
-        for (var _i = 0, _len = obj[attr].items.length; _i < _len; _i++) {
-          copy[_i] = transformArrays(obj[attr].items[_i], context);
-        }
-      } else {
-        copy[attr] = transformArrays(obj[attr], context);
-      }
-    }
-
-    return copy;
-  }
-
-  throw new Error("Unable to copy obj! Its type isn't supported.");
-};
-
-exports.transformArrays = transformArrays;

package/module/preparse.js

@@ -1,124 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-// import { getEnum, nodes, toStr, toInt } from 'pgsql-enums';
-// NOTE: this is used to get rid of List.items... and use Arrays
-export const preparse = tree => transformArrays(tree); // export const transform = (obj, context) => {
-//   let copy = null;
-//   // Handle null or undefined
-//   if (obj == null) {
-//     return obj;
-//   }
-//   // Handle the 3 simple types
-//   if (typeof obj !== 'object') {
-//     // if (context.enum) {
-//     //   return toInt[context.enum][obj];
-//     //   return obj;
-//     // } else {
-//     return obj;
-//     // }
-//   }
-//   // Handle Date
-//   if (obj instanceof Date) {
-//     copy = new Date();
-//     copy.setTime(obj.getTime());
-//     return copy;
-//   }
-//   // Handle Array
-//   if (obj instanceof Array) {
-//     copy = [];
-//     for (let i = 0, len = obj.length; i < len; i++) {
-//       copy[i] = transform(obj[i], context);
-//     }
-//     return copy;
-//   }
-//   // Handle Object
-//   if (obj instanceof Object || typeof obj === 'object') {
-//     copy = {};
-//     for (const attr in obj) {
-//       // IF IS AST NODE
-//       if (nodes.hasOwnProperty(attr)) {
-//         context = { node: attr };
-//         copy[attr] = transform(obj[attr], context);
-//       } else {
-//         // MUST BE A FIELD
-//         if (context && context.node) {
-//           const attrSchema = nodes[context.node][attr];
-//           if (attrSchema?.enum) {
-//             copy[attr] = transform(obj[attr], {
-//               enum: attrSchema.type
-//             });
-//           } else if (nodes.hasOwnProperty(attrSchema?.type)) {
-//             if (attrSchema.type === 'Expr') {
-//               copy[attr] = transform(obj[attr], {
-//                 node: attrSchema.type
-//               });
-//             } else {
-//               copy[attr] = {
-//                 [attrSchema.type]: transform(obj[attr], {
-//                   node: attrSchema.type
-//                 })
-//               };
-//             }
-//           } else {
-//             copy[attr] = transform(obj[attr], context);
-//           }
-//         } else {
-//           copy[attr] = transform(obj[attr], context);
-//         }
-//       }
-//     }
-//     return copy;
-//   }
-//   throw new Error("Unable to copy obj! Its type isn't supported.");
-// };
-
-export const transformArrays = (obj, context) => {
-  let copy = null; // Handle null or undefined
-
-  if (obj == null) {
-    return obj;
-  } // Handle the 3 simple types
-
-
-  if (typeof obj !== 'object') {
-    return obj;
-  } // Handle Date
-
-
-  if (obj instanceof Date) {
-    copy = new Date();
-    copy.setTime(obj.getTime());
-    return copy;
-  } // Handle Array
-
-
-  if (obj instanceof Array) {
-    copy = [];
-
-    for (let i = 0, len = obj.length; i < len; i++) {
-      copy[i] = transformArrays(obj[i], context);
-    }
-
-    return copy;
-  } // Handle Object
-
-
-  if (obj instanceof Object || typeof obj === 'object') {
-    copy = {};
-
-    for (const attr in obj) {
-      if (attr === 'List') {
-        copy = [];
-
-        for (let i = 0, len = obj[attr].items.length; i < len; i++) {
-          copy[i] = transformArrays(obj[attr].items[i], context);
-        }
-      } else {
-        copy[attr] = transformArrays(obj[attr], context);
-      }
-    }
-
-    return copy;
-  }
-
-  throw new Error("Unable to copy obj! Its type isn't supported.");
-};