Merge pull request #32 from tomquist/tom/deparse

Add bindings for pg_query_deparse_protobuf

Author: pyramation

.gitignore

@@ -4,6 +4,7 @@ libs/
 npm-debug.log
 libpg_query/**/*.a
 libpg_query/**/*.h
+libpg_query/**/*.proto
 wasm/libpg-query.js
 *.wasm
 .cache

index.d.ts

@@ -1,6 +1,8 @@
 export function parseQuery(sql: string): Promise<any>;
+export function deparse(parseTree: any): Promise<string>;
 export function parsePlPgSQL(funcsSql: string): Promise<any>;
 export function parseQuerySync(sql: string): any;
+export function deparseSync(parseTree: any): any;
 export function parsePlPgSQLSync(funcsSql: string): any;
 export function fingerprint(sql: string): Promise<string>;
 export function fingerprintSync(sql: string): string;

index.js

@@ -1,4 +1,6 @@
-const PgQuery = require('./build/Release/queryparser.node');
+const PgQuery = require('./build/Release/queryparser');
+const { pg_query } = require('./proto');
+
 
 module.exports = {
   parseQuery(query) {
@@ -9,6 +11,16 @@ module.exports = {
     });
   },
 
+  deparse(parseTree) {
+    const msg = pg_query.ParseResult.fromObject(parseTree);
+    const data = pg_query.ParseResult.encode(msg).finish();
+    return new Promise((resolve, reject) => {
+      PgQuery.deparseAsync(data, (err, result) => {
+        err ? reject(err) : resolve(result);
+      });
+    });
+  },
+
   parsePlPgSQL(query) {
     return new Promise((resolve, reject) => {
       PgQuery.parsePlPgSQLAsync(query, (err, result) => {
@@ -21,6 +33,12 @@ module.exports = {
     return JSON.parse(PgQuery.parseQuerySync(query));
   },
 
+  deparseSync(parseTree) {
+    const msg = pg_query.ParseResult.fromObject(parseTree);
+    const data = pg_query.ParseResult.encode(msg).finish();
+    return PgQuery.deparseSync(data);
+  },
+
   parsePlPgSQLSync(query) {
     return JSON.parse(PgQuery.parsePlPgSQLSync(query));
   },

libpg_query/protobuf/.gitkeep

@@ -30,6 +30,7 @@
     }
   },
   "scripts": {
+    "proto": "node_modules/protobufjs-cli/bin/pbjs --keep-case -t static-module -o proto.js libpg_query/protobuf/pg_query.proto",
     "clean": "rimraf build",
     "configure": "node-pre-gyp configure",
     "install": "node-pre-gyp install --fallback-to-build --loglevel verbose",
@@ -54,11 +55,13 @@
     "chai": "^3.5.0",
     "emnapi": "^0.43.1",
     "lodash": "^4.17.15",
-    "mocha": "^5.2.0"
+    "mocha": "^5.2.0",
+    "protobufjs-cli": "https://gitpkg.now.sh/michaelbgreen/protobuf.js/cli?6254efb1bd9263978e9a90da3b05c4ccbcd6564a"
   },
   "dependencies": {
     "@emnapi/runtime": "^0.43.1",
     "@mapbox/node-pre-gyp": "^1.0.8",
+    "protobufjs": "git+https://github.com/michaelbgreen/protobuf.js.git#c0b68ac5c8fbb1ded261c0924bbce0538370333e"
     "node-addon-api": "^7.0.0",
     "node-gyp": "^10.0.1"
   },