Merge branch 'main' of https://github.com/port-labs/jq-binding-node

port-labs · Feb 17, 2023 · 8f55dbf · 8f55dbf
2 parents c941e22 + 60a701c
commit 8f55dbf
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 56 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install node-gyp deps
         run: |
           if [ "${{ matrix.os }}" == "ubuntu-22.04" ]; then
-            sudo apt-get install -y autoconf make libtool automake
+            sudo apt-get install -y autoconf make libtool automake 
           else
             brew install autoconf automake libtool
           fi

diff --git a/.gitignore b/.gitignore
@@ -2,11 +2,8 @@ build/
 node_modules/
 deps/jq
 npm-debug.log
-
 docs
-
 .DS_Store
-
 .vscode
-
 load.js
+reports/
diff --git a/.npmignore b/.npmignore
@@ -11,3 +11,4 @@ build
 **/.git
 .git
 */.git
+reports/**
diff --git a/binding.gyp b/binding.gyp
@@ -8,15 +8,15 @@
             "include_dirs": [
                 "<!(node -e \"require('nan')\")",
                 "<(module_root_dir)/",
-                "deps/jq"
+                "deps/jq/src"
             ],
             'conditions': [
                 [
                     'OS=="linux"',
                     {
                         "libraries": [
-                            "../build/deps/libjq.so.1",
                             "-Wl,-rpath='$$ORIGIN/../deps'",
+                            "../build/deps/libjq.so.1",
                         ],
                         'cflags_cc': [
                             '-std=c++17'
@@ -43,7 +43,7 @@
                             '-std=c++17'
                         ],
                         "include_dirs": [
-                            "deps/jq"
+                            "deps/jq/src"
                         ]
                     }
                 ]

diff --git a/configure b/configure
@@ -15,13 +15,14 @@ CPPFLAGS=-D_REENTRANT ./configure \
             --libdir="${scriptdir}/build/deps" \
             --prefix="${scriptdir}/build/deps" $*
 make -j8
-make install-libLTLIBRARIES install-includeHEADERS
 
 cp modules/oniguruma/src/.libs/libonig.a ${scriptdir}/build/deps/libonig.a
 cp modules/oniguruma/src/.libs/libonig.la ${scriptdir}/build/deps/libonig.la
 cp modules/oniguruma/src/.libs/libonig.lai ${scriptdir}/build/deps/libonig.lai
 cp modules/oniguruma/src/.libs/libonig.4.dylib ${scriptdir}/build/deps/libonig.4.dylib
 cp modules/oniguruma/src/.libs/libonig.dylib ${scriptdir}/build/deps/libonig.dylib
 
+make install-libLTLIBRARIES install-includeHEADERS
+
 echo "finished building jq"
 popd &> /dev/null
diff --git a/lib/index.js b/lib/index.js
@@ -9,7 +9,6 @@ const escapeFilter = (filter) => {
 module.exports = {
   exec: (object, filter) => {
     try {
-      console.log(escapeFilter(filter))
       const data =  nativeJq.exec(JSON.stringify(object), escapeFilter(filter))
 
       return data?.value;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@port-labs/jq-node-bindings",
-  "version": "v0.0.4",
+  "version": "v0.0.5",
   "description": "Node.js bindings for JQ",
-  "jq-node-bindings": "0.0.4",
+  "jq-node-bindings": "0.0.5",
   "main": "lib/index.js",
   "scripts": {
     "configure": "node-gyp configure",
@@ -45,4 +45,4 @@
   "engines": {
     "node": ">=6.0.0"
   }
-}
+}
diff --git a/reports/jest-port-api.xml b/reports/jest-port-api.xml