@port-labs/jq-node-bindings 1.0.1 → 1.0.2-rc.1

package/deps/jq/src/util.c

@@ -107,12 +107,12 @@ jv get_home() {
 #else
     home = getenv("USERPROFILE");
     if (!home) {
+      char *hd = getenv("HOMEDRIVE");
+      if (!hd) hd = "";
       home = getenv("HOMEPATH");
       if (!home) {
         ret = jv_invalid_with_msg(jv_string("Could not find home directory."));
       } else {
-        const char *hd = getenv("HOMEDRIVE");
-        if (!hd) hd = "";
         ret = jv_string_fmt("%s%s",hd,home);
       }
     } else {
@@ -451,7 +451,7 @@ jv jq_util_input_next_input(jq_util_input_state *state) {
   return value;
 }
 
-#ifndef HAVE_STRPTIME
+#if defined(WIN32) && !defined(HAVE_STRPTIME)
 /* http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/lib/libc/time/strptime.c?only_with_tag=HEAD
  * NetBSD implementation strptime().
  * Format description: https://netbsd.gw.com/cgi-bin/man-cgi?strptime+3+NetBSD-current
@@ -533,32 +533,32 @@ static const unsigned char *find_string(const unsigned char *, int *, const char
 static char* utc = "UTC";
 #endif
 /* RFC-822/RFC-2822 */
-static const char *const nast[] = {
+static const char* const nast[] = {
        "EST",    "CST",    "MST",    "PST",    "\0\0\0"
 };
-static const char *const nadt[] = {
+static const char* const nadt[] = {
        "EDT",    "CDT",    "MDT",    "PDT",    "\0\0\0"
 };
-static const char *const weekday_name[] =
+static const char* weekday_name[] =
 {
     "Sunday", "Monday", "Tuesday", "Wednesday",
     "Thursday", "Friday", "Saturday"
 };
-static const char *const ab_weekday_name[] =
+static const char* ab_weekday_name[] =
 {
     "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
-static const char *const month_name[] =
+static const char* month_name[] =
 {
     "January", "February", "March", "April", "May", "June",
     "July", "August", "September", "October", "November", "December"
 };
-static const char *const ab_month_name[] =
+static const char* ab_month_name[] =
 {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
-static const char *const am_pm[] = {"AM", "PM"};
+static const char* am_pm[] = {"AM", "PM"};
 
 
 /*
@@ -708,7 +708,7 @@ recurse:
             continue;
 
         case 'x':	/* The date, using the locale's format. */
-            /* fall through */
+            /* fall throug */
 
         case 'D':	/* The date as "%y/%m/%d". */
         {
@@ -818,46 +818,40 @@ recurse:
             LEGAL_ALT(ALT_O);
             continue;
 
-        case 's': {     /* seconds since the epoch */
-#ifdef _WIN32
-            const time_t TIME_MAX = INT32_MAX;
-#else
-            const time_t TIME_MAX = INT64_MAX;
+#ifndef TIME_MAX
+#define TIME_MAX	INT64_MAX
 #endif
-            time_t sse, d;
+        case 's':	/* seconds since the epoch */
+            {
+                time_t sse = 0;
+                uint64_t rulim = TIME_MAX;
 
-            if (*bp < '0' || *bp > '9') {
-                bp = NULL;
-                continue;
-            }
-
-            sse = *bp++ - '0';
-            while (*bp >= '0' && *bp <= '9') {
-                d = *bp++ - '0';
-                if (sse > TIME_MAX/10) {
+                if (*bp < '0' || *bp > '9') {
                     bp = NULL;
-                    break;
+                    continue;
                 }
-                sse *= 10;
-                if (sse > TIME_MAX - d) {
+
+                do {
+                    sse *= 10;
+                    sse += *bp++ - '0';
+                    rulim /= 10;
+                } while ((sse * 10 <= TIME_MAX) &&
+                     rulim && *bp >= '0' && *bp <= '9');
+
+                if (sse < 0 || (uint64_t)sse > TIME_MAX) {
                     bp = NULL;
-                    break;
+                    continue;
                 }
-                sse += d;
-            }
-            if (bp == NULL)
-                continue;
-
 #ifdef _WIN32
-            if (localtime_s(tm, &sse))
+                if (localtime_s(tm, &sse) == 0)
 #else
-            if (localtime_r(&sse, tm) == NULL)
+                if (localtime_r(&sse, tm))
 #endif
-                bp = NULL;
-            else
-                state |= S_YDAY | S_WDAY | S_MON | S_MDAY | S_YEAR;
-            continue;
+                    state |= S_YDAY | S_WDAY | S_MON | S_MDAY | S_YEAR;
+                else
+                    bp = NULL;
             }
+            continue;
 
         case 'U':	/* The week of year, beginning on sunday. */
         case 'W':	/* The week of year, beginning on monday. */

package/deps/jq/src/util.h

@@ -59,7 +59,7 @@ const void *_jq_memmem(const void *haystack, size_t haystacklen,
 
 #include <time.h>
 
-#ifndef HAVE_STRPTIME
+#if defined(WIN32) && !defined(HAVE_STRPTIME)
 char* strptime(const char *buf, const char *fmt, struct tm *tm);
 #endif
 

package/deps/jq/tests/jq.test

@@ -61,7 +61,7 @@ null
 null
 "interpolation"
 
-@text,@json,([1,.]|@csv,@tsv),@html,(@uri|.,@urid),@sh,(@base64|.,@base64d)
+@text,@json,([1,.]|@csv,@tsv),@html,@uri,@sh,(@base64|.,@base64d)
 "!()<>&'\"\t"
 "!()<>&'\"\t"
 "\"!()<>&'\\\"\\t\""
@@ -69,7 +69,6 @@ null
 "1\t!()<>&'\"\\t"
 "!()&lt;&gt;&amp;&apos;&quot;\t"
 "%21%28%29%3C%3E%26%27%22%09"
-"!()<>&'\"\t"
 "'!()<>&'\\''\"\t'"
 "ISgpPD4mJyIJ"
 "!()<>&'\"\t"
@@ -87,10 +86,6 @@ null
 "\u03bc"
 "%CE%BC"
 
-@urid
-"%CE%BC"
-"\u03bc"
-
 @html "<b>\(.)</b>"
 "<script>hax</script>"
 "<b>&lt;script&gt;hax&lt;/script&gt;</b>"
@@ -183,11 +178,6 @@ map(try .a[] catch ., try .a.[] catch ., .a[]?, .a.[]?)
 [{"a": [1,2]}, {"a": 123}]
 [1,2,1,2,1,2,1,2,"Cannot iterate over number (123)","Cannot iterate over number (123)"]
 
-# oss-fuzz #66070: objects[] leaks if a non-last element throws an error
-try ["OK", (.[] | error)] catch ["KO", .]
-{"a":["b"],"c":["d"]}
-["KO",["b"]]
-
 #
 # Negative array indices
 #
@@ -322,10 +312,6 @@ null
 [{"a":1}, {"b":2}, {"a":3, "b":4}]
 [-1, -1, -4]
 
-[foreach range(5) as $x (0; .+$x | select($x!=2); [$x,.])]
-null
-[[0,0],[1,1],[3,4],[4,8]]
-
 [limit(3; .[])]
 [11,22,33,44,55,66,77,88,99]
 [11,22,33]
@@ -338,38 +324,10 @@ null
 "badness"
 [1]
 
-try limit(-1; error) catch .
-null
-"limit doesn't support negative count"
-
-[skip(3; .[])]
-[1,2,3,4,5,6,7,8,9]
-[4,5,6,7,8,9]
-
-[skip(0,2,3,4; .[])]
-[1,2,3]
-[1,2,3,3]
-
-[skip(3; .[])]
-[]
-[]
-
-try skip(-1; error) catch .
-null
-"skip doesn't support negative count"
-
-nth(1; 0,1,error("foo"))
-null
-1
-
 [first(range(.)), last(range(.))]
 10
 [0,9]
 
-[first(range(.)), last(range(.))]
-0
-[]
-
 [nth(0,5,9,10,15; range(.)), try nth(-1; range(.)) catch .]
 10
 [0,5,9,"nth doesn't support negative indices"]
@@ -679,19 +637,6 @@ map_values(.+1)
 [0,1,2]
 [1,2,3]
 
-[add(null), add(range(range(10))), add(empty), add(10,range(10))]
-null
-[null,120,null,55]
-
-# Real-world use case for add(empty)
-.sum = add(.arr[])
-{"arr":[]}
-{"arr":[],"sum":null}
-
-add({(.[]):1}) | keys
-["a","a","b","a","d","b","d","a","d"]
-["a","b","d"]
-
 #
 # User-defined functions
 # Oh god.
@@ -829,10 +774,6 @@ reduce . as $n (.; .)
 null
 null
 
-reduce range(5) as $x (0; .+$x | select($x!=2))
-null
-8
-
 # Destructuring
 . as {$a, b: [$c, {$d}]} | [$a, $c, $d]
 {"a":1, "b":[2,{"d":3}]}
@@ -1388,26 +1329,6 @@ split("")
 "xababababax"
 [1,7,[1,3,5,7]]
 
-# trim
-# \u000b is vertical tab (\v not supported by json)
-map(trim), map(ltrim), map(rtrim)
-[" \n\t\r\f\u000b", "","  ", "a", " a ", "abc", "  abc  ", "  abc", "abc  "]
-["", "", "", "a", "a", "abc", "abc", "abc", "abc"]
-["", "", "", "a", "a ", "abc", "abc  ", "abc", "abc  "]
-["", "", "", "a", " a", "abc", "  abc", "  abc", "abc"]
-
-trim, ltrim, rtrim
-"\u0009\u000A\u000B\u000C\u000D\u0020\u0085\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000abc\u0009\u000A\u000B\u000C\u000D\u0020\u0085\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000"
-"abc"
-"abc\u0009\u000A\u000B\u000C\u000D\u0020\u0085\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000"
-"\u0009\u000A\u000B\u000C\u000D\u0020\u0085\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000abc"
-
-try trim catch ., try ltrim catch ., try rtrim catch .
-123
-"trim input must be a string"
-"trim input must be a string"
-"trim input must be a string"
-
 indices(1)
 [0,1,1,2,3,4,1,5]
 [1,2,6]
@@ -1424,22 +1345,6 @@ indices(", ")
 "a,b, cd,e, fgh, ijkl"
 [3,9,14]
 
-index("!")
-"здравствуй мир!"
-14
-
-.[:rindex("x")]
-"正xyz"
-"正"
-
-indices("o")
-"🇬🇧oo"
-[2,3]
-
-indices("o")
-"ƒoo"
-[1,2]
-
 [.[]|split(",")]
 ["a, bc, def, ghij, jklmn, a,b, c,d, e,f", "a,b,c,d, e,f,g,h"]
 [["a"," bc"," def"," ghij"," jklmn"," a","b"," c","d"," e","f"],["a","b","c","d"," e","f","g","h"]]
@@ -1658,14 +1563,6 @@ strftime("%A, %B %d, %Y")
 1435677542.822351
 "Tuesday, June 30, 2015"
 
-strftime("%Y-%m-%dT%H:%M:%SZ")
-[2024,2,15]
-"2024-03-15T00:00:00Z"
-
-mktime
-[2024,8,21]
-1726876800
-
 gmtime
 1425599507
 [2015,2,5,23,51,47,4,63]
@@ -1683,15 +1580,6 @@ try mktime catch .
 ["a",1,2,3,4,5,6,7]
 "mktime requires parsed datetime inputs"
 
-# oss-fuzz #67403: non-string argument with number input fails assert
-try ["OK", strftime([])] catch ["KO", .]
-0
-["KO","strftime/1 requires a string format"]
-
-try ["OK", strflocaltime({})] catch ["KO", .]
-0
-["KO","strflocaltime/1 requires a string format"]
-
 # module system
 import "a" as foo; import "b" as bar; def fooa: foo::a; [fooa, bar::a, bar::b, foo::a]
 null
@@ -1948,17 +1836,17 @@ map(. == 1)
 
 # When no arithmetic is involved jq should preserve the literal value
 
-.[0] | tostring | . == if have_decnum then "13911860366432393" else "13911860366432392" end
+.[0] | tostring
 [13911860366432393]
-true
+"13911860366432393"
 
-.x | tojson | . == if have_decnum then "13911860366432393" else "13911860366432392" end
+.x | tojson
 {"x":13911860366432393}
-true
+"13911860366432393"
 
-(13911860366432393 == 13911860366432392) | . == if have_decnum then false else true end
+13911860366432393 == 13911860366432392
 null
-true
+false
 
 
 # Applying arithmetic to the value will truncate the result to double
@@ -2051,7 +1939,7 @@ tojson | fromjson
 {"a":null}
 
 # also "nan with payload" #2985
-if have_decnum then fromjson else nan end | isnan
+fromjson | isnan
 "nan1234"
 true
 
@@ -2112,8 +2000,8 @@ null
 2
 
 .[] |= try tonumber
-["1", "2a", "3", " 4 ", "5.67", ".89", "-876", "+5.43", 21]
-[1, 3, 5.67, 0.89, -876, 5.43, 21]
+["1", "2a", "3", 4]
+[1, 3, 4]
 
 # Also 1859, but from 2073
 any(keys[]|tostring?;true)
@@ -2215,9 +2103,6 @@ try ["ok", setpath([1]; 1)] catch ["ko", .]
 {"hi":"hello"}
 ["ko","Cannot index object with number"]
 
-try fromjson catch .
-"{'a': 123}"
-"Invalid string literal; expected \", but got ' at line 1, column 5 (while parsing '{'a': 123}')"
 
 # ltrimstr/1 rtrimstr/1 don't leak on invalid input #2977
 
@@ -2230,26 +2115,3 @@ try ltrimstr("x") catch "x", try rtrimstr("x") catch "x" | "ok"
 {"hey":[]}
 "ok"
 "ok"
-
-# ltrimstr/1 and rtrimstr/1 return an error for non-strings. #2969
-
-.[] as [$x, $y] | try ["ok", ($x | ltrimstr($y))] catch ["ko", .]
-[["hi",1],[1,"hi"],["hi","hi"],[1,1]]
-["ko","startswith() requires string inputs"]
-["ko","startswith() requires string inputs"]
-["ok",""]
-["ko","startswith() requires string inputs"]
-
-.[] as [$x, $y] | try ["ok", ($x | rtrimstr($y))] catch ["ko", .]
-[["hi",1],[1,"hi"],["hi","hi"],[1,1]]
-["ko","endswith() requires string inputs"]
-["ko","endswith() requires string inputs"]
-["ok",""]
-["ko","endswith() requires string inputs"]
-
-
-# oss-fuzz #66061: setpath/2 leaks when indexing array with array
-
-try ["OK", setpath([[1]]; 1)] catch ["KO", .]
-[]
-["KO","Cannot update field at array index of array"]

package/deps/jq/tests/jq_fuzz_load_file.c

@@ -1,6 +1,5 @@
 #include <stdint.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "jv.h"
 

package/deps/jq/tests/man.test

@@ -6,21 +6,21 @@
 0.12345678901234567890123456789
 0.12345678901234567890123456789
 
-[., tojson] | . == if have_decnum then [12345678909876543212345,"12345678909876543212345"] else [12345678909876543000000,"12345678909876543000000"] end
+[., tojson]
 12345678909876543212345
-true
+[12345678909876543212345,"12345678909876543212345"]
 
 . < 0.12345678901234567890123456788
 0.12345678901234567890123456789
 false
 
-map([., . == 1]) | tojson | . == if have_decnum then "[[1,true],[1.000,true],[1.0,true],[1.00,true]]" else "[[1,true],[1,true],[1,true],[1,true]]" end
+map([., . == 1]) | tojson
 [1, 1.000, 1.0, 100e-2]
-true
+"[[1,true],[1.000,true],[1.0,true],[1.00,true]]"
 
-. as $big | [$big, $big + 1] | map(. > 10000000000000000000000000000000) | . == if have_decnum then [true, false] else [false, false] end
+. as $big | [$big, $big + 1] | map(. > 10000000000000000000000000000000)
 10000000000000000000000000000001
-true
+[true, false]
 
 .foo
 {"foo": 42, "bar": "less interesting data"}
@@ -358,10 +358,6 @@ add
 []
 null
 
-add(.[].a)
-[{"a":3}, {"a":5}, {"b":6}]
-8
-
 any
 [true, false]
 true
@@ -606,12 +602,6 @@ combinations(2)
 ["fo", "foo", "barfoo", "foobar", "foob"]
 ["fo","","bar","foobar","foob"]
 
-trim, ltrim, rtrim
-" abc "
-"abc"
-"abc "
-" abc"
-
 explode
 "foobar"
 [102,111,111,98,97,114]
@@ -873,22 +863,14 @@ isempty(.[])
 [1,2,3]
 false
 
-[limit(3; .[])]
+[limit(3;.[])]
 [0,1,2,3,4,5,6,7,8,9]
 [0,1,2]
 
-[skip(3; .[])]
-[0,1,2,3,4,5,6,7,8,9]
-[3,4,5,6,7,8,9]
-
-[first(range(.)), last(range(.)), nth(5; range(.))]
+[first(range(.)), last(range(.)), nth(./2; range(.))]
 10
 [0,9,5]
 
-[first(empty), last(empty), nth(5; empty)]
-null
-[]
-
 [range(.)]|[first, last, nth(5)]
 10
 [0,9,5]

package/deps/jq/tests/setup

@@ -12,10 +12,6 @@ JQTESTDIR=$(cd "$(dirname "$0")" && pwd)
 JQBASEDIR=$JQTESTDIR/..
 JQ=${JQ:-$JQBASEDIR/jq}
 
-# Some tests have locale-dependent output; use C locale.  Fixes #3038
-LC_ALL=C
-export LC_ALL
-
 if [ -z "${NO_VALGRIND-}" ] && which valgrind > /dev/null; then
     VALGRIND="valgrind --error-exitcode=1 --leak-check=full \
                        --suppressions=$JQTESTDIR/onig.supp \