add updates from 16-latest re building on windows, upgrade node gyp

Author: pyramation

.github/workflows/build-dry-run.yml

@@ -0,0 +1,41 @@
+name: Build Dry Run
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, macos-latest, ubuntu-latest]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build project
+      run: |
+        yarn
+    - uses: actions/upload-artifact@v2
+      with:
+        name: build-artifact-${{ matrix.os }}
+        path: |
+          ${{ matrix.os == 'macos-latest' && './libpg_query/osx/libpg_query.a' || 
+             matrix.os == 'ubuntu-latest' && './libpg_query/linux/libpg_query.a' || 
+             '' }}
+  prepare-and-publish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/download-artifact@v2
+      with:
+        path: downloaded-artifacts
+    - name: Prepare artifacts
+      run: |
+        # move or prepare artifacts
+        ls downloaded-artifacts/* 
+    # - name: Publish to NPM
+    #   run: |
+    #     # Assuming you've set up your package.json and .npmrc correctly
+    #     npm publish
+      # env:
+        # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/run-tests.yml

@@ -0,0 +1,31 @@
+name: Run Tests 🧪
+
+on:
+  pull_request:
+    types: [opened, push, reopened]
+  workflow_dispatch:
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository 📥
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js 🌐
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          cache: 'yarn'
+
+      - name: Install Dependencies 🧶
+        run: |
+          yarn
+
+      - name: Build Project 🏗️
+        run: |
+          yarn build
+          yarn symlink
+
+      - name: Test 🔍
+        run: yarn test

.gitignore

@@ -7,3 +7,4 @@ libpg_query/**/*.h
 wasm/libpg-query.js
 *.wasm
 .cache
+libpg_query/windows/*.lib

.travis.yml

@@ -8,14 +8,6 @@
         "src/sync.cc",
         "src/async.cc"
       ],
-      "actions": [
-        {
-          "outputs": ['libpg_query/include/pg_query.h'],
-          "inputs": [],
-          "action": ['script/buildAddon.sh'],
-          "action_name": 'prebuild_dependencies'
-        }
-      ],
       'cflags!': [ '-fno-exceptions' ],
       'cflags_cc!': [ '-fno-exceptions' ],
       'include_dirs': [
@@ -25,22 +17,58 @@
       'dependencies': ["<!(node -p \"require('node-addon-api').gyp\")"],
       'conditions': [
         ['OS=="linux"', {
-          "libraries": [ "-L<!(pwd)/libpg_query/linux", "-lpg_query" ]
+          "libraries": [ "-L<!(pwd)/libpg_query/linux", "-lpg_query" ],
+          "actions": [
+            {
+              "outputs": ['libpg_query/include/pg_query.h'],
+              "inputs": [],
+              "action": ['script/buildAddon.sh'],
+              "action_name": 'prebuild_dependencies'
+            }
+          ],
         }],
         ['OS=="mac"', {
           "libraries": [ "-L<!(pwd)/libpg_query/osx", "-lpg_query" ],
           "xcode_settings": {
             "CLANG_CXX_LIBRARY": "libc++",
             'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
             'MACOSX_DEPLOYMENT_TARGET': '10.7'
-          }
+          },
+          "actions": [
+            {
+              "outputs": ['libpg_query/include/pg_query.h'],
+              "inputs": [],
+              "action": ['script/buildAddon.sh'],
+              "action_name": 'prebuild_dependencies'
+            }
+          ],
         }],
         ['OS=="win"', {
+          "link_settings": {
+            "library_dirs": [
+              "../libpg_query/windows"
+            ],
+            "libraries": [
+              "../libpg_query/windows/pg_query.lib"
+            ],
+          },
           "msvs_settings": {
             "VCCLCompilerTool": {
-              "ExceptionHandling": 1
+              "ExceptionHandling": 0,
+              "AdditionalOptions": ["/EHsc"]
+            }
+          },
+          "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
+          "actions":[
+            {
+              "outputs": [
+                ""
+              ],
+              "inputs": [],
+              "action": ['../script/buildAddon.bat'],
+              "action_name": 'prebuild_dependencies'
             }
-          }
+          ]
         }]
       ]
     }

binding.gyp

@@ -1,4 +1,4 @@
-FROM node:12.18.2-alpine3.11
+FROM node:20-alpine
 RUN apk --no-cache add git
 RUN apk add --no-cache bash
 RUN apk add --no-cache make

docker/Dockerfile

@@ -2,7 +2,7 @@
   "name": "libpg-query",
   "version": "15.0.3",
   "description": "The real PostgreSQL query parser",
-  "homepage": "https://github.com/pyramation/libpg-query-node",
+  "homepage": "https://github.com/launchql/libpg-query-node",
   "main": "index.js",
   "typings": "index.d.ts",
   "publishConfig": {
@@ -46,7 +46,7 @@
   "license": "LICENSE IN LICENSE",
   "repository": {
     "type": "git",
-    "url": "git://github.com/pyramation/libpg-query-node.git"
+    "url": "git://github.com/launchql/libpg-query-node.git"
   },
   "devDependencies": {
     "chai": "^3.5.0",
@@ -58,7 +58,7 @@
     "@emnapi/runtime": "^0.43.1",
     "@mapbox/node-pre-gyp": "^1.0.8",
     "node-addon-api": "^7.0.0",
-    "node-gyp": "^8.0.0"
+    "node-gyp": "^10.0.1"
   },
   "keywords": [
     "sql",

package.json

@@ -0,0 +1,68 @@
+@echo off
+
+set commit=db39825bc7c1ddd45962ec6a626d740b7f8f027a
+set branch=15-latest
+
+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 %branch% --single-branch https://github.com/pganalyze/libpg_query.git
+cd libpg_query
+
+rem Checkout the desired commit
+git checkout %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

script/buildAddon.bat

@@ -18,13 +18,13 @@ describe("Queries", () => {
         (it) => it.stmts[0].stmt.SelectStmt.targetList
       );
 
-      expect(selectedDatas[0][0].ResTarget.val.A_Const.val.Integer.ival).to.eq(
+      expect(selectedDatas[0][0].ResTarget.val.A_Const.ival.ival).to.eq(
         1
       );
-      expect(selectedDatas[1][0].ResTarget.val.A_Const.val).to.have.property(
-        "Null"
+      expect(selectedDatas[1][0].ResTarget.val.A_Const.isnull).to.eq(
+        true
       );
-      expect(selectedDatas[2][0].ResTarget.val.A_Const.val.String.str).to.eq(
+      expect(selectedDatas[2][0].ResTarget.val.A_Const.sval.sval).to.eq(
         ""
       );
       expect(selectedDatas[3]).to.have.lengthOf(2);