@port-labs/jq-node-bindings 1.0.4 → 1.1.0-dev

package/.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git submodule:*)",
+      "Bash(npm test:*)",
+      "Bash(brew list:*)",
+      "Bash(node:*)",
+      "Bash(xxd /Users/dorm/dev/port-labs/jq-node-bindings/test/santiy.test.js)",
+      "Bash(npm ci:*)"
+    ]
+  }
+}

package/configure

@@ -17,11 +17,12 @@ CPPFLAGS=-D_REENTRANT ./configure CFLAGS=-fPIC \
             --prefix="${scriptdir}/build/deps" $*
 make -j8
 
-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.5.dylib ${scriptdir}/build/deps/libonig.5.dylib
-cp modules/oniguruma/src/.libs/libonig.dylib ${scriptdir}/build/deps/libonig.dylib
+cp vendor/oniguruma/src/.libs/libonig.a ${scriptdir}/build/deps/libonig.a
+cp vendor/oniguruma/src/.libs/libonig.la ${scriptdir}/build/deps/libonig.la
+cp vendor/oniguruma/src/.libs/libonig.lai ${scriptdir}/build/deps/libonig.lai
+# Copy platform-specific shared libraries
+cp vendor/oniguruma/src/.libs/libonig*.dylib ${scriptdir}/build/deps/ 2>/dev/null || true
+cp vendor/oniguruma/src/.libs/libonig*.so* ${scriptdir}/build/deps/ 2>/dev/null || true
 
 make install-libLTLIBRARIES install-includeHEADERS
 

package/deps/jq/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(grep:*)"
+    ]
+  }
+}

package/deps/jq/.gitattributes

@@ -1,9 +1,7 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 * text=auto eol=lf
-
-# vendored files
-src/decNumber/** linguist-vendored
+vendor/** linguist-vendored
 
 # generated files
 src/lexer.[ch] linguist-generated=true

package/deps/jq/AUTHORS

@@ -26,9 +26,11 @@ Alex Ozdemir         <aozdemir@hmc.edu>
 Alex Wilson          <gpg@probablyfine.co.uk>
 Alexandre Jasmin     <ajasmin@transtex-llc.com>
 Allan Clark          <allanc@chickenandporn.com>
+Andreas Heiduk       <asheiduk@users.noreply.github.com>
 Andrew O'Brien       <obrien.andrew@gmail.com>
 Andrew Rodland       <andrew@cleverdomain.org>
 Andrew Speed         <andrew.cspeed@gmail.com>
+Andy Lester          <andy@petdance.com>
 Ankur                <ankz.kothari@gmail.com>
 Anthony Shortland    <anthony@dtosolutions.com>
 Anthony Sottile      <asottile@umich.edu>
@@ -37,16 +39,23 @@ Attila Fülöp         <attila@fueloep.org>
 Benjamin Wuethrich   <benjamin@koho.ca>
 Benoit de Chezelles  <bew@users.noreply.github.com>
 Bernard Niset        <bernard.niset@gmail.com>
+Bhargava Mummadireddy <kishoreinvits@gmail.com>
+Binbin Qian          <qianbinbin@hotmail.com>
 Bradley Skaggs       <bskaggs@acm.org>
+Brahm Lower          <bplower@gmail.com>
 Brendan Macmillan    <melbourne.research@gmail.com>
 Cameron Sparr        <cameronsparr@gmail.com>
 Chance Zibolski      <czibolsk@redhat.com>
 Charles Merriam      <charles.merriam@gmail.com>
+Chris LaRose         <cjlarose@gmail.com>
 Chris Moore          <dooglus@gmail.com>
+Christoph Anton Mitterer <calestyo@scientia.org>
 Christopher Degawa   <ccom@randomderp.com>
 Ciaran McNamara      <1372986+ciaranmcnamara@users.noreply.github.com>
 Clément MATHIEU      <clement@unportant.info>
+Colin Leroy-Mira     <colin@colino.net>
 Colin von Heuring    <colin@janrain.com>
+Dag-Erling Smørgrav  <des@des.no>
 Damian Gryski        <damian@gryski.com>
 Dan Church           <h3xx@users.noreply.github.com>
 Daniel Lange         <DLange@git.local>
@@ -55,24 +64,31 @@ David Fetter         <david@fetter.org>
 David Haguenauer     <ml@kurokatta.org>
 David Korczynski     <david@adalogics.com>
 David R. MacIver     <david@drmaciver.com>
+DavidKorczynski      <david@adalogics.com>
 Dawid Ferenczy Rogožan <ferenczy@users.noreply.github.com>
 Derrick Pallas       <derrick@pallas.us>
 Doug Luce            <doug@github.con.com>
 Eiichi Sato          <sato.eiichi@gmail.com>
 Eli Schwartz         <eschwartz@archlinux.org>
+Eloy Coto            <eloy.coto@gmail.com>
 Eric Bréchemier      <eric@egull.co>
 Erik Brinkman        <erik.brinkman@gmail.com>
 Eugen                <EugenGez@gmail.com>
 Evan Zacks           <zackse@gmail.com>
+Fabian Dellwing      <fabian.dellwing@mbconnectline.de>
 Felix Wolfsteller    <felix.wolfsteller@gmail.com>
 Filippo Giunchedi    <fgiunchedi@gmail.com>
 Filippo Valsorda     <filippo.valsorda@gmail.com>
 Florian Weimer       <fweimer@redhat.com>
 Frederic Cambus      <fcambus@users.sourceforge.net>
+Gabriel Marin        <gbrlmarn@gmail.com>
+Gaelan Steele        <gbs@canishe.com>
+George Hopkins       <george-hopkins@null.net>
 Gert Van Gool        <gertvangool@gmail.com>
 Gijs Kunze           <gwkunze@gmail.com>
 Gustav               <gustav@invoke.se>
 HE, Tao              <sighingnow@gmail.com>
+Han Jiang            <jhcarl0814@gmail.com>
 Hanfei Shen          <qqshfox@gmail.com>
 Hanson Char          <hanson.char@gmail.com>
 Haochen Xie          <haochenx@acm.org>
@@ -81,6 +97,7 @@ Henré Botha          <henrebotha@gmail.com>
 Ian Miell            <ian.miell@gmail.com>
 Ikko Ashimine        <eltociear@gmail.com>
 J Phani Mahesh       <github@phanimahesh.me>
+J. B. Rainsberger    <me@jbrains.ca>
 Jack Pearkes         <jackpearkes@gmail.com>
 Jakub Jirutka        <jakub@jirutka.cz>
 Jakub Wilk           <jwilk@jwilk.net>
@@ -90,16 +107,21 @@ Jan Schulz           <jasc@gmx.net>
 Janne Cederberg      <janne.cederberg@gmail.com>
 Jason Hood           <jadoxa@yahoo.com.au>
 Jay Satiro           <raysatiro@yahoo.com>
+Jesper Rønn-Jensen   <jesperrr@gmail.com>
 Jingwen Owen Ou      <jingweno@gmail.com>
 Joe Littlejohn       <joe.littlejohn@nokia.com>
 Joel Nothman         <joel.nothman@gmail.com>
 Joel Purra           <code+github@joelpurra.com>
+Jonathan Chan Kwan Yin <sofe2038@gmail.com>
 Jonathan Word        <argoday@argoday.com>
 Josh Soref           <2119212+jsoref@users.noreply.github.com>
 Juan Guerrero        <juan.guerrero.lozano@gmail.com>
+Kamontat Chantrachirathumrong <14089557+kamontat@users.noreply.github.com>
 Kenny Shen           <kenny.shen@zalora.com>
 Kim De Mey           <kim.demey@gmail.com>
 Kim Toms             <kim.toms@bplglobal.net>
+Kirk McKelvey        <kirkoman@gmail.com>
+Klemens Nanni        <kn@openbsd.org>
 LCD 47               <lcd047@gmail.com>
 Larry Aasen          <larryaasen@gmail.com>
 Lee Thompson         <stagr.lee@gmail.com>
@@ -110,25 +132,29 @@ MCApollo             <34170230+MCApollo@users.noreply.github.com>
 Marc Abramowitz      <marc@marc-abramowitz.com>
 Marc Bruggmann       <marcbr@spotify.com>
 Marcin Kłopotek      <marcin.klopotek@gmail.com>
+Marcin Serwin        <marcin@serwin.dev>
 Mark Feit            <mfeit@internet2.edu>
 Mark McKinstry       <mmckinst@umich.edu>
 Markus Lanthaler     <mark_lanthaler@gmx.net>
 Matt Clegg           <m@cle.gg>
+Matt Meyers          <matt@mattmeyers.dev>
 Matti Åstrand        <mattiastr@gmail.com>
 Mattias Hansson      <hansson.mattias@gmail.com>
 Maxime Biais         <maxime.biais@gmail.com>
 Maximilian Roos      <5635139+max-sixty@users.noreply.github.com>
 Michael Daines       <michael@mdaines.com>
+Michael Färber       <01mf02@gmail.com>
 Mike Daines          <mdaines@users.noreply.github.com>
 Mike Fletcher        <john.m.fletcher@bankofamerica.com>
 Mike McCabe          <mccabe@archive.org>
+Nathan Baulch        <nathan.baulch@gmail.com>
 Naïm Favier          <n@monade.li>
 Nicolas Pouillard    <nicolas.pouillard@gmail.com>
+Nicole Wren          <nicole@wren.systems>
 Paul Chvostek        <paul+gitkraken@it.ca>
 Paul Wise            <pabs3@bonedaddy.net>
 Peter van Dijk       <peter@7bits.nl>
 Philipp Hagemeister  <phihag@phihag.de>
-Rémy Léone           <remy.leone@gmail.com>
 Ricardo Constantino  <wiiaboo@gmail.com>
 Richard Groves       <richard@noodlfroot.com>
 Richard H Lee        <richard@webdezign.co.uk>
@@ -139,6 +165,9 @@ Roland C. Dowdeswell <roland.dowdeswell@twosigma.com>
 Roman Inflianskas    <rominf@users.noreply.github.com>
 Romero Malaquias     <romero.malaquias@gmail.com>
 Ryoichi KATO         <ryo1kato@gmail.com>
+Rémy Léone           <remy.leone@gmail.com>
+SArpnt               <sarpnt@ficial.net>
+Samar Sunkaria       <sameesunkaria@me.com>
 Santiago Lapresta    <santiago.lapresta@gmail.com>
 Sean Wei             <me@sean.taipei>
 Sebastian Freundt    <freundt@ga-group.nl>
@@ -149,17 +178,25 @@ Stefan               <stefan.haubenthal@gmail.com>
 Stefan Seemayer      <stefan@seemayer.de>
 Stephen Roantree     <stroantree@gmail.com>
 Stephen Shaw         <stesh@netsoc.tcd.ie>
+Steven Ihde          <sihde@hamachi.us>
 Steven Maude         <StevenMaude@users.noreply.github.com>
 Steven Penny         <svnpenn@gmail.com>
+Thalia Archibald     <thalia@archibald.dev>
+TheOdd               <owenhines@protonmail.com>
+Thomas Bozeman th026106 <thomas.bozeman@digitalglobe.com>
 Thomas R. Hall       <trhall@trhall.org>
+Thomas Sibley        <tom@zulutango.org>
 Tim McCormack        <cortex@brainonfire.net>
 Timothy John Perisho Eccleston <combinatorist@users.noreply.github.com>
 Tom Wolf             <github@incognitox.org>
 Tomas Halman         <thalman@redhat.com>
 Travis Gockel        <travis@gockelhut.com>
+Tyler Rockwood       <rockwotj@users.noreply.github.com>
+Ulrich Eckhardt      <ulrich.eckhardt@base-42.de>
 W-Mark Kubacki       <wmark@hurrikane.de>
 William Chargin      <wchargin@gmail.com>
 Yasuhiro Matsumoto   <mattn.jp@gmail.com>
+Yeikel               <email@yeikel.com>
 Yoichi Nakayama      <yoichi.nakayama@gmail.com>
 Zhaohui Mei          <mzh.whut@gmail.com>
 Zhiming Wang         <zmwangx@gmail.com>
@@ -167,14 +204,31 @@ calpeconsulting      <61429736+calpeconsulting@users.noreply.github.com>
 cdnbacon             <mike@busbud.com>
 dak180               <dak180@users.sf.net>
 davkor               <david@adalogics.com>
+dependabot[bot]      <49699333+dependabot[bot]@users.noreply.github.com>
 eitsupi              <50911393+eitsupi@users.noreply.github.com>
+fletcher gornick     <fletcher@gornick.dev>
+github-actions[bot]  <41898282+github-actions[bot]@users.noreply.github.com>
+goodactive           <167312449+goodactive@users.noreply.github.com>
 i                    <isomorphisms@sdf.org>
 jkleint              <jkleint@gmail.com>
+lectrical            <14344693+lectrical@users.noreply.github.com>
+liviubobocu          <liviu.bobocu@uipath.com>
+maflcko              <6399679+maflcko@users.noreply.github.com>
 mail6543210          <mail6543210@yahoo.com.tw>
 mjarosie             <mjarosie@users.noreply.github.com>
+myaaaaaaaaa          <103326468+myaaaaaaaaa@users.noreply.github.com>
 nmulcahey            <nmulcahey@gmail.com>
+orbea                <orbea@riseup.net>
 polyester            <paul@cleanclothes.org>
 rain1                <rain1@airmail.cc>
+riastradh            <campbell+github@mumble.net>
+sachint              <32639496+sachintu47@users.noreply.github.com>
+sheepster            <omer531998@gmail.com>
 tal@whatexit.org     <tal@whatexit.org>
+taoky                <taoky99@outlook.com>
 trantor              <trantorvega@gmail.com>
+wellweek             <148746285+wellweek@users.noreply.github.com>
+wllm-rbnt            <william.robinet@conostix.com>
 zstadler             <zeev.stadler@gmail.com>
+наб                  <nabijaczleweli@nabijaczleweli.xyz>
+엄태용               <lg65438805@gmail.com>

package/deps/jq/COPYING

@@ -106,6 +106,15 @@ shall not be used in advertising or otherwise to promote the sale, use
 or other dealings in this Software without prior written authorization
 of the copyright holder.
 
+--------------------------------------------------------------------------------
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
+
+
+
+jv_thread.h is copied from Heimdal's lib/base/heimbase.h and some code
+in jv.c is copied from Heimdal's lib/base/dll.c:
+
+
 Portions Copyright (c) 2016 Kungliga Tekniska Högskolan
 (Royal Institute of Technology, Stockholm, Sweden).
 All rights reserved.
@@ -134,3 +143,34 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+
+jq uses a modified version of NetBSD implementation strptime(),
+which is distributed under the following license:
+
+Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
+All rights reserved.
+
+This code was contributed to The NetBSD Foundation by Klaus Klein.
+Heavily optimised by David Laight
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

package/deps/jq/Makefile.am

@@ -5,21 +5,22 @@ LIBJQ_INCS = src/builtin.h src/bytecode.h src/compile.h                 \
         src/exec_stack.h src/jq_parser.h src/jv_alloc.h src/jv_dtoa.h   \
         src/jv_unicode.h src/jv_utf8_tables.h src/lexer.l src/libm.h    \
         src/linker.h src/locfile.h src/opcode_list.h src/parser.y       \
-        src/util.h src/decNumber/decContext.h src/decNumber/decNumber.h \
-        src/decNumber/decNumberLocal.h src/jv_dtoa_tsd.h src/jv_thread.h \
-        src/jv_private.h
+        src/util.h src/jv_dtoa_tsd.h src/jv_thread.h src/jv_private.h   \
+        vendor/decNumber/decContext.h vendor/decNumber/decNumber.h      \
+        vendor/decNumber/decNumberLocal.h
 
 LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c    \
         src/jq_test.c src/jv.c src/jv_alloc.c src/jv_aux.c              \
         src/jv_dtoa.c src/jv_file.c src/jv_parse.c src/jv_print.c       \
         src/jv_unicode.c src/linker.c src/locfile.c src/util.c          \
-        src/decNumber/decContext.c src/decNumber/decNumber.c            \
         src/jv_dtoa_tsd.c                                               \
+        vendor/decNumber/decContext.c vendor/decNumber/decNumber.c      \
         ${LIBJQ_INCS}
 
 ### C build options
 
-AM_CFLAGS = -Wextra -Wall -Wno-unused-parameter -Wno-unused-function
+AM_CFLAGS = -Wextra -Wall -Wno-unused-parameter -Wno-unused-function \
+            -Woverlength-strings -Wstrict-prototypes
 
 if WIN32
 AM_CFLAGS += -municode
@@ -32,8 +33,8 @@ ACLOCAL_AMFLAGS = -I config/m4
 # While there is some autoconf macro support for lex/flex, it doesn't support
 # header file creation so we'll use good old make
 if MAINTAINER_MODE
-BUILT_SOURCES = src/lexer.h src/lexer.c src/parser.h src/parser.c 	\
-		src/builtin.inc src/config_opts.inc src/version.h
+BUILT_SOURCES = src/lexer.h src/lexer.c src/parser.h src/parser.c \
+                src/builtin.inc src/config_opts.inc src/version.h
 src/lexer.c: src/lexer.l
 	$(AM_V_LEX) flex -o src/lexer.c --header-file=src/lexer.h $<
 src/lexer.h: src/lexer.c
@@ -64,23 +65,18 @@ endif
 
 include_HEADERS = src/jv.h src/jq.h
 
-if ENABLE_UBSAN
-AM_CFLAGS += -fsanitize=undefined
-endif
-
-AM_CPPFLAGS = -I$(srcdir)/src
+AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/vendor
 
-### Running tests under Valgrind
+### Address sanitizer (ASan)
 
 if ENABLE_ASAN
 AM_CFLAGS += -fsanitize=address
-NO_VALGRIND = 1
-else
-if ENABLE_VALGRIND
-NO_VALGRIND =
-else
-NO_VALGRIND = 1
 endif
+
+### Undefined Behavior Sanitizer
+
+if ENABLE_UBSAN
+AM_CFLAGS += -fsanitize=undefined
 endif
 
 ### Code coverage with gcov
@@ -103,7 +99,7 @@ endif
 # Remake the version.h header file if, and only if, the git ID has changed
 .PHONY: .FORCE
 .FORCE:
-generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
+generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | xargs printf '\043define JQ_VERSION \"%s\"\n'`"
 .remake-version-h: .FORCE
 	@ $(generate_ver); test "x`cat src/version.h 2>/dev/null`" = "x$$ver" || touch .remake-version-h
 src/version.h: .remake-version-h
@@ -119,27 +115,35 @@ src/main.c: src/version.h src/config_opts.inc
 
 src/builtin.inc: $(srcdir)/src/builtin.jq
 	mkdir -p src
-	$(AM_V_GEN) sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $(srcdir)/src/builtin.jq > $@
+	$(AM_V_GEN) od -v -A n -t o1 -- $< | \
+	sed -e 's/$$/ /' \
+	    -e 's/\([0123456789]\) /\1, /g' \
+	    -e 's/ $$//' \
+	    -e 's/ 0/  0/g' \
+	    -e 's/ \([123456789]\)/ 0\1/g' > $@
 src/builtin.o: src/builtin.inc
 
 CLEANFILES = src/version.h .remake-version-h src/builtin.inc src/config_opts.inc
 
 bin_PROGRAMS = jq
-jq_SOURCES = src/main.c src/version.h
-jq_LDFLAGS = -static-libtool-libs
+jq_SOURCES = src/main.c
 jq_LDADD = libjq.la -lm
 
 if ENABLE_ALL_STATIC
-jq_LDFLAGS += -all-static
+jq_LDFLAGS = -all-static
 endif
 
 ### Tests (make check)
 
-TESTS = tests/mantest tests/jqtest tests/shtest tests/utf8test tests/base64test
+TESTS = tests/mantest tests/jqtest tests/shtest tests/utf8test tests/base64test tests/uritest
 if !WIN32
 TESTS += tests/optionaltest
 endif
-AM_TESTS_ENVIRONMENT = JQ=$(abs_builddir)/jq NO_VALGRIND=$(NO_VALGRIND)
+
+AM_TESTS_ENVIRONMENT = JQ=$(abs_builddir)/jq
+if ENABLE_VALGRIND
+AM_TESTS_ENVIRONMENT += ENABLE_VALGRIND=1
+endif
 
 # This is a magic make variable that causes it to treat tests/man.test as a
 # DATA-type dependency for the check target. As a result, it will attempt to
@@ -154,11 +158,11 @@ check_DATA = tests/man.test
 # Making changes to the manpage without having the python deps means your
 # tests won't run. If you aren't making changes to the examples, you probably
 # don't care. But if you are, then you need to run the tests anyway.
-tests/man.test tests/manonig.test: $(srcdir)/docs/content/manual/manual.yml
+tests/man.test tests/manonig.test: $(srcdir)/docs/content/manual/dev/manual.yml
 if ENABLE_DOCS
 	$(AM_V_GEN) ( cd ${abs_srcdir}/docs && \
-		$(PIPENV) run python validate_manual_schema.py content/manual/manual.yml && \
-		$(PIPENV) run python build_mantests.py )
+	  $(PIPENV) run python validate_manual_schema.py content/manual/dev/manual.yml && \
+	  $(PIPENV) run python build_mantests.py )
 else
 	@echo Changes to the manual.yml require docs to be enabled to update the manual test.
 	@echo As a result, the manual test is out of date.
@@ -170,11 +174,11 @@ endif
 # manpage, then we'll end up using the cached version. Otherwise, we need to
 # rebuild it.
 man_MANS = jq.1
-jq.1.prebuilt: $(srcdir)/docs/content/manual/manual.yml
+jq.1.prebuilt: $(srcdir)/docs/content/manual/dev/manual.yml
 if ENABLE_DOCS
 	$(AM_V_GEN) ( cd ${abs_srcdir}/docs && \
-		$(PIPENV) run python validate_manual_schema.py content/manual/manual.yml && \
-		$(PIPENV) run python build_manpage.py ) > $@
+	  $(PIPENV) run python validate_manual_schema.py content/manual/dev/manual.yml && \
+	  $(PIPENV) run python build_manpage.py ) > $@
 else
 	@echo Changes to the manual.yml require docs to be enabled to update the manpage.
 	@echo As a result, the manpage is out of date.
@@ -188,8 +192,9 @@ CLEANFILES += jq.1
 ### Build oniguruma
 
 if BUILD_ONIGURUMA
-libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
-SUBDIRS = modules/oniguruma
+libjq_la_LIBADD += vendor/oniguruma/src/.libs/libonig.la
+jq_LDADD += vendor/oniguruma/src/.libs/libonig.la
+SUBDIRS = vendor/oniguruma
 endif
 
 AM_CFLAGS += $(onig_CFLAGS)
@@ -212,7 +217,6 @@ EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER)     \
         jq.1.prebuilt jq.spec src/lexer.c src/lexer.h src/parser.c      \
         src/parser.h src/version.h src/builtin.jq scripts/version       \
         libjq.pc                                                        \
-        tests/base64.test tests/jq-f-test.sh tests/jq.test              \
         tests/modules/a.jq tests/modules/b/b.jq tests/modules/c/c.jq    \
         tests/modules/c/d.jq tests/modules/data.json                    \
         tests/modules/home1/.jq tests/modules/home2/.jq/g.jq            \
@@ -226,7 +230,7 @@ EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER)     \
         tests/onig.supp tests/local.supp                                \
         tests/setup tests/torture/input0.json                           \
         tests/optional.test tests/man.test tests/manonig.test           \
-        tests/jq.test tests/onig.test tests/base64.test                 \
+        tests/jq.test tests/onig.test tests/base64.test tests/uri.test  \
         tests/utf8-truncate.jq tests/jq-f-test.sh                       \
         tests/no-main-program.jq tests/yes-main-program.jq