Yamlize/config

.gitignore

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

.templates/buildAddon.bat

@@ -0,0 +1,90 @@
+@echo off
+
+set LIBPG_REPO=___LIBPG_REPO___
+set LIBPG_COMMIT=___LIBPG_COMMIT___
+set LIBPG_BRANCH=___LIBPG_BRANCH___
+
+:: Check if each required variable is set
+if "%LIBPG_REPO%"=="" (
+    echo ERROR: LIBPG_REPO variable is not set.
+    exit /B 1
+)
+
+if "%LIBPG_COMMIT%"=="" (
+    echo ERROR: LIBPG_COMMIT variable is not set.
+    exit /B 1
+)
+
+if "%LIBPG_BRANCH%"=="" (
+    echo ERROR: LIBPG_BRANCH variable is not set.
+    exit /B 1
+)
+
+:: The environment variables must be set
+echo Using repository: %LIBPG_REPO%
+echo Using commit: %LIBPG_COMMIT%
+echo Using branch: %LIBPG_BRANCH%
+
+setlocal enabledelayedexpansion
+
+rem Remember current's parent directory and create a new, unique, temporary directory
+set buildDir=%cd%
+set projectDir=%cd%\..
+set tmpDir=%temp%\tmpdir.libpg_query
+rmdir /s /q %tmpDir%
+md %tmpDir%
+
+
+rem Define the make target
+set makeTarget=build
+
+rem Change to the newly created temp directory
+cd /D %tmpDir%
+
+
+rem Clone the selected branch of the libpg_query Git repo
+git clone -b %LIBPG_BRANCH% --single-branch %LIBPG_REPO%
+cd libpg_query
+
+rem Checkout the desired commit
+git checkout %LIBPG_COMMIT%
+
+rem needed if being invoked from within gyp
+set MAKEFLAGS=
+set MFLAGS=
+
+rem set path with Windows Developer Command Prompt
+echo "please ensure you are running at Windows Developer Command Prompt environments"
+nmake /F Makefile.msvc clean
+nmake /F Makefile.msvc build
+
+
+rem Terminate if build fails
+if %errorlevel% NEQ 0 (
+    echo ERROR: 'nmake' command failed
+)
+
+rem Search for pg_query.obj (libpg_query.a), error if not found
+for /f "delims=" %%f in ('dir /b /s pg_query.lib') do set file=%%f
+if not defined file (
+    echo "ERROR: pg_query.lib not found"
+
+)
+
+rem Error if pg_query.h is missing
+for /f "delims=" %%f in ('dir /b /s pg_query.h') do set file=%%f
+if not defined file (
+    echo "ERROR: pg_query.h not found"
+
+)
+
+rem Copy pg_query.lib to windows dir
+copy /Y pg_query.lib "%projectDir%\libpg_query\windows\"
+
+rem Copy header
+copy /Y pg_query.h "%projectDir%\libpg_query\include\"
+
+rem Cleanup: revert to original directory
+cd /D %buildDir%
+
+exit /B 0

.templates/buildAddon.sh

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+LIBPG_REPO=___LIBPG_REPO___
+LIBPG_COMMIT=___LIBPG_COMMIT___
+LIBPG_BRANCH=___LIBPG_BRANCH___
+
+# Check if variables are set and exit if not
+if [ -z "$LIBPG_COMMIT" ]; then
+    echo "ERROR: LIBPG_COMMIT variable is not set."
+    exit 1
+fi
+
+if [ -z "$LIBPG_BRANCH" ]; then
+    echo "ERROR: LIBPG_BRANCH variable is not set."
+    exit 1
+fi
+
+if [ -z "$LIBPG_REPO" ]; then
+    echo "ERROR: LIBPG_REPO variable is not set."
+    exit 1
+fi
+
+# Remember current directory and create a new, unique, temporary directory
+rDIR=$(pwd)
+tmpDir=$(mktemp -d 2>/dev/null || mktemp -d -t 'tmpdir.XXXX')
+
+# Define the make target
+makeTarget=build
+
+# Change to the newly created temp directory
+cd "$tmpDir"
+
+# Clone the selected branch of the libpg_query Git repo
+git clone -b $LIBPG_BRANCH --single-branch $LIBPG_REPO
+cd libpg_query
+
+# Checkout the desired commit
+git checkout $LIBPG_COMMIT
+
+# needed if being invoked from within gyp
+unset MAKEFLAGS
+unset MFLAGS
+
+# Adaptively build for macOS or Linux
+if [ "$(uname)" == "Darwin" ]; then
+	make CFLAGS='-mmacosx-version-min=10.7' PG_CFLAGS='-mmacosx-version-min=10.7' $makeTarget
+elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+	make CFLAGS='' PG_CFLAGS='' $makeTarget
+fi
+
+# Terminate if build fails
+if [ $? -ne 0 ]; then
+	echo "ERROR: 'make' command failed";
+	exit 1;
+fi
+
+# Search for libpg_query.a, error if not found
+file=$(ls | grep 'libpg_query.a')
+if [ ! $file ]; then
+	echo "ERROR: libpg_query.a not found";
+	exit 1;
+fi
+
+# Error if pg_query.h is missing
+file=$(ls | grep 'pg_query.h')
+if [ ! $file ]; then
+	echo "ERROR: pg_query.h not found";
+	exit 1;
+fi
+
+# Copy queryparser.cc, binding.gyp to current directory
+if [ "$(uname)" == "Darwin" ]; then
+    cp $(pwd)/libpg_query.a $rDIR/libpg_query/osx/
+elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+    cp $(pwd)/libpg_query.a $rDIR/libpg_query/linux/
+fi
+
+# Copy header
+cp $(pwd)/pg_query.h $rDIR/libpg_query/include/
+cp $(pwd)/protobuf/*.proto $rDIR/libpg_query/protobuf/
+
+# Cleanup: revert to original directory and remove the temp
+cd "$rDIR"
+rm -rf "$tmpDir"

.templates/protogen.js

@@ -0,0 +1,38 @@
+const { exec } = require('child_process');
+
+// Configuration Variables
+const branchName = '___LIBPG_BRANCH___';
+const protoUrl = `https://raw.githubusercontent.com/pganalyze/libpg_query/${branchName}/protobuf/pg_query.proto`;
+const inFile = 'libpg_query/protobuf/pg_query.proto';
+const outFile = 'proto.js';
+
+const protogenCmd = [
+  'pg-proto-parser',
+  'protogen',
+  '--protoUrl',
+  protoUrl,
+  '--inFile',
+  inFile,
+  '--outFile',
+  outFile,
+  '--originalPackageName',
+  'protobufjs/minimal',
+  '--newPackageName',
+  '@launchql/protobufjs/minimal'
+];
+
+// Step 2: Generate proto.js using pbjs (Assuming pbjs is installed and accessible)
+function generateProtoJS(callback) {
+  exec(protogenCmd.join(' '), (error, stdout, stderr) => {
+    if (error) {
+      console.error(`Error during code generation: ${error.message}`);
+      return;
+    }
+    console.log('Generated proto.js from proto file.');
+    callback();
+  });
+}
+
+  generateProtoJS(() => {
+    console.log('all done 🎉');
+  });

.yamlize/versions/14-latest.yaml

@@ -0,0 +1,7 @@
+env:
+  JOB: pg-14
+  LIBPG_REPO: https://github.com/pganalyze/libpg_query.git
+  LIBPG_COMMIT: 1577ef7c6c349542149e34ffbfafc244ab942ec6
+  LIBPG_BRANCH: 14-latest
+  PGSQL_TYPES: 14.0.0
+  OPERATION_SYSYTEMS: [linux,mac]

.yamlize/versions/15-latest.yaml

@@ -0,0 +1,7 @@
+env:
+  JOB: pg-15
+  LIBPG_REPO: https://github.com/pganalyze/libpg_query.git
+  LIBPG_COMMIT: db39825bc7c1ddd45962ec6a626d740b7f8f027a
+  LIBPG_BRANCH: 15-latest
+  PGSQL_TYPES: 15.0.2
+  OPERATION_SYSYTEMS: [linux,mac]

.yamlize/versions/16-latest.yaml

@@ -0,0 +1,7 @@
+env:
+  JOB: pg-16
+  LIBPG_REPO: https://github.com/pganalyze/libpg_query.git
+  LIBPG_COMMIT: 1ec38940e5c6f09a4c1d17a46d839a881c4f2db7
+  LIBPG_BRANCH: 16-latest
+  PGSQL_TYPES: 16.0.0
+  OPERATION_SYSYTEMS: [linux,mac,win]

README.md

@@ -18,7 +18,6 @@
    <a href="https://github.com/launchql/libpg-query-node/actions/workflows/run-tests-win.yml">
     <img height="20" src="https://github.com/launchql/libpg-query-node/actions/workflows/run-tests-win.yml/badge.svg" />
    </a>
-
 </p>
 
 The real PostgreSQL parser, exposed for nodejs.

index.d.ts

@@ -3,6 +3,8 @@ export function parseQuery(sql: string): Promise<ParseResult>;
 export function parsePlPgSQL(funcsSql: string): Promise<any>;
 export function parseQuerySync(sql: string): ParseResult;
 export function parsePlPgSQLSync(funcsSql: string): any;
+export function deparse(parseTree: any): Promise<string>;
+export function deparseSync(parseTree: any): any;
 export function fingerprint(sql: string): Promise<string>;
 export function fingerprintSync(sql: string): string;
 export * from '@pgsql/types';

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));
   },

package.json

@@ -30,6 +30,7 @@
     }
   },
   "scripts": {
+    "protogen": "node ./script/protogen.js 16-latest",
     "clean": "rimraf build",
     "configure": "node-pre-gyp configure",
     "install": "node-pre-gyp install --fallback-to-build --loglevel verbose",
@@ -40,6 +41,7 @@
     "clean:wasm": "yarn make:wasm clean",
     "clean-cache:wasm": "yarn make:wasm clean-cache",
     "workflows": "node script/workflows.js",
+    "build:generate": "node script/utils/generate.js",
     "test": "mocha --timeout 5000",
     "binary:build": "node-pre-gyp rebuild package",
     "binary:publish": "AWS_PROFILE=supabase-dev node-pre-gyp publish"
@@ -51,6 +53,7 @@
     "url": "git://github.com/launchql/libpg-query-node.git"
   },
   "devDependencies": {
+    "@launchql/proto-cli": "1.25.0",
     "@yamlize/cli": "^0.8.0",
     "chai": "^3.5.0",
     "emnapi": "^0.43.1",
@@ -60,8 +63,10 @@
   },
   "dependencies": {
     "@emnapi/runtime": "^0.43.1",
+    "@launchql/protobufjs": "7.2.6",
     "@mapbox/node-pre-gyp": "^1.0.8",
-    "@pgsql/types": "^15.0.1",
+    "@pgsql/types": "15.0.2",
+    "js-yaml": "^4.1.0",
     "node-addon-api": "^7.0.0",
     "node-gyp": "^10.0.1"
   },
@@ -80,4 +85,4 @@
     "host": "https://supabase-public-artifacts-bucket.s3.amazonaws.com",
     "remote_path": "./libpg-query-node/"
   }
-}
+}