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

package/deps/jq/src/jv_dtoa_tsd.c

@@ -19,7 +19,7 @@ static void tsd_dtoa_ctx_dtor(void *ctx) {
 #ifndef WIN32
 static
 #endif
-void jv_tsd_dtoa_ctx_fini() {
+void jv_tsd_dtoa_ctx_fini(void) {
   struct dtoa_context *ctx = pthread_getspecific(dtoa_ctx_key);
   tsd_dtoa_ctx_dtor(ctx);
   pthread_setspecific(dtoa_ctx_key, NULL);
@@ -28,7 +28,7 @@ void jv_tsd_dtoa_ctx_fini() {
 #ifndef WIN32
 static
 #endif
-void jv_tsd_dtoa_ctx_init() {
+void jv_tsd_dtoa_ctx_init(void) {
   if (pthread_key_create(&dtoa_ctx_key, tsd_dtoa_ctx_dtor) != 0) {
     fprintf(stderr, "error: cannot create thread specific key");
     abort();
@@ -36,13 +36,14 @@ void jv_tsd_dtoa_ctx_init() {
   atexit(jv_tsd_dtoa_ctx_fini);
 }
 
-inline struct dtoa_context *tsd_dtoa_context_get() {
+inline struct dtoa_context *tsd_dtoa_context_get(void) {
   pthread_once(&dtoa_ctx_once, jv_tsd_dtoa_ctx_init); // cannot fail
   struct dtoa_context *ctx = (struct dtoa_context*)pthread_getspecific(dtoa_ctx_key);
   if (!ctx) {
-    ctx = malloc(sizeof(struct dtoa_context));
+    ctx = jv_mem_alloc(sizeof(struct dtoa_context));
     jvp_dtoa_context_init(ctx);
     if (pthread_setspecific(dtoa_ctx_key, ctx) != 0) {
+      jv_mem_free(ctx);
       fprintf(stderr, "error: cannot set thread specific data");
       abort();
     }

package/deps/jq/src/jv_dtoa_tsd.h

@@ -1,4 +1,4 @@
 #ifndef JV_DTOA_TSD_H
 #define JV_DTOA_TSD_H
-struct dtoa_context *tsd_dtoa_context_get();
+struct dtoa_context *tsd_dtoa_context_get(void);
 #endif

package/deps/jq/src/jv_parse.c

@@ -11,7 +11,7 @@
 typedef const char* presult;
 
 #ifndef MAX_PARSING_DEPTH
-#define MAX_PARSING_DEPTH (256)
+#define MAX_PARSING_DEPTH (10000)
 #endif
 
 #define TRY(x) do {presult msg__ = (x); if (msg__) return msg__; } while(0)
@@ -493,7 +493,7 @@ static pfunc found_string(struct jv_parser* p) {
         return "Invalid escape";
       }
     } else {
-      if (c >= 0 && c <= 0x001f)
+      if (!(c & ~0x1F))
         return "Invalid string: control characters from U+0000 through U+001F must be escaped";
       *out++ = c;
     }
@@ -512,9 +512,11 @@ static pfunc check_literal(struct jv_parser* p) {
   switch (p->tokenbuf[0]) {
   case 't': pattern = "true"; plen = 4; v = jv_true(); break;
   case 'f': pattern = "false"; plen = 5; v = jv_false(); break;
+  case '\'':
+    return "Invalid string literal; expected \", but got '";
   case 'n':
     // if it starts with 'n', it could be a literal "nan"
-    if (p->tokenbuf[1] == 'u') {
+    if (p->tokenpos > 1 && p->tokenbuf[1] == 'u') {
       pattern = "null"; plen = 4; v = jv_null();
     }
   }

package/deps/jq/src/jv_print.c

@@ -27,43 +27,70 @@
 // Color table. See https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
 // for how to choose these. The order is same as jv_kind definition, and
 // the last color is used for object keys.
-static char color_bufs[8][16];
-static const char *color_bufps[8];
-static const char* def_colors[] =
-  {COL("0;90"),    COL("0;39"),      COL("0;39"),     COL("0;39"),
+#define DEFAULT_COLORS \
+  {COL("0;90"),    COL("0;39"),      COL("0;39"),     COL("0;39"),\
    COL("0;32"),    COL("1;39"),      COL("1;39"),     COL("1;34")};
+static const char *const default_colors[] = DEFAULT_COLORS;
+static const char *colors[] = DEFAULT_COLORS;
+#define COLORS_LEN (sizeof(colors) / sizeof(colors[0]))
 #define FIELD_COLOR (colors[7])
 
-static const char **colors = def_colors;
+static char *colors_buf = NULL;
+int jq_set_colors(const char *code_str) {
+  if (code_str == NULL)
+    return 1;
 
-int
-jq_set_colors(const char *c)
-{
-  const char *e;
-  size_t i;
+  // the start of each color code in the env var, and the byte after the end of the last one
+  const char *codes[COLORS_LEN + 1];
+  size_t num_colors;
+  // must be initialized before `goto default_colors`, used later to loop over every color
+  size_t ci = 0;
 
-  if (c == NULL)
-    return 1;
-  colors = def_colors;
-  memset(color_bufs, 0, sizeof(color_bufs));
-  for (i = 0; i < sizeof(def_colors) / sizeof(def_colors[0]); i++)
-    color_bufps[i] = def_colors[i];
-  for (i = 0; i < sizeof(def_colors) / sizeof(def_colors[0]) && *c != '\0'; i++, c = e) {
-    if ((e = strchr(c, ':')) == NULL)
-      e = c + strlen(c);
-    if ((size_t)(e - c) > sizeof(color_bufs[i]) - 4 /* ESC [ m NUL */)
-      return 0;
-    color_bufs[i][0] = ESC[0];
-    color_bufs[i][1] = '[';
-    (void) strncpy(&color_bufs[i][2], c, e - c);
-    if (strspn(&color_bufs[i][2], "0123456789;") < strlen(&color_bufs[i][2]))
-      return 0;
-    color_bufs[i][2 + (e - c)] = 'm';
-    color_bufps[i] = color_bufs[i];
-    if (e[0] == ':')
-      e++;
+  for (num_colors = 0;; num_colors++) {
+    codes[num_colors] = code_str;
+    code_str += strspn(code_str, "0123456789;");
+    if (code_str[0] == '\0' || num_colors + 1 >= COLORS_LEN) {
+      break;
+    } else if (code_str[0] != ':') {
+      return 0; // invalid character
+    }
+    code_str++;
+  }
+  if (codes[num_colors] != code_str) {
+    // count the last color and store its end (plus one byte for consistency with starts)
+    // an empty last color would be ignored (for cases like "" and "0:")
+    num_colors++;
+    codes[num_colors] = code_str + 1;
+  } else if (num_colors == 0) {
+    if (colors_buf != NULL) {
+      jv_mem_free(colors_buf);
+      colors_buf = NULL;
+    }
+    goto default_colors;
+  }
+
+  colors_buf = jv_mem_realloc(
+    colors_buf,
+    // add ESC '[' 'm' to each string
+    // '\0' is already included in difference of codes
+    codes[num_colors] - codes[0] + 3 * num_colors
+  );
+  char *cb = colors_buf;
+  for (; ci < num_colors; ci++) {
+    colors[ci] = cb;
+    size_t len = codes[ci + 1] - 1 - codes[ci];
+
+    cb[0] = ESC[0];
+    cb[1] = '[';
+    memcpy(cb + 2, codes[ci], len);
+    cb[2 + len] = 'm';
+    cb[3 + len] = '\0';
+
+    cb += len + 4;
   }
-  colors = color_bufps;
+  default_colors:
+  for (; ci < COLORS_LEN; ci++)
+    colors[ci] = default_colors[ci];
   return 1;
 }
 
@@ -206,7 +233,7 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
       if (jv_get_kind(msg) == JV_KIND_STRING) {
         put_str("<invalid:", F, S, flags & JV_PRINT_ISATTY);
         jvp_dump_string(msg, flags | JV_PRINT_ASCII, F, S, flags & JV_PRINT_ISATTY);
-        put_str(">", F, S, flags & JV_PRINT_ISATTY);
+        put_char('>', F, S, flags & JV_PRINT_ISATTY);
       } else {
         put_str("<invalid>", F, S, flags & JV_PRINT_ISATTY);
       }
@@ -259,22 +286,18 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
       put_str("[]", F, S, flags & JV_PRINT_ISATTY);
       break;
     }
-    put_str("[", F, S, flags & JV_PRINT_ISATTY);
-    if (flags & JV_PRINT_PRETTY) {
-      put_char('\n', F, S, flags & JV_PRINT_ISATTY);
-      put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
-    }
+    put_char('[', F, S, flags & JV_PRINT_ISATTY);
     jv_array_foreach(x, i, elem) {
       if (i!=0) {
-        if (flags & JV_PRINT_PRETTY) {
-          put_str(",\n", F, S, flags & JV_PRINT_ISATTY);
-          put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
-        } else {
-          put_str(",", F, S, flags & JV_PRINT_ISATTY);
-        }
+        if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
+        put_char(',', F, S, flags & JV_PRINT_ISATTY);
+      }
+      if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);
+      if (flags & JV_PRINT_PRETTY) {
+        put_char('\n', F, S, flags & JV_PRINT_ISATTY);
+        put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
       }
       jv_dump_term(C, elem, flags, indent + 1, F, S);
-      if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
     }
     if (flags & JV_PRINT_PRETTY) {
       put_char('\n', F, S, flags & JV_PRINT_ISATTY);
@@ -292,10 +315,6 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
       break;
     }
     put_char('{', F, S, flags & JV_PRINT_ISATTY);
-    if (flags & JV_PRINT_PRETTY) {
-      put_char('\n', F, S, flags & JV_PRINT_ISATTY);
-      put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
-    }
     int first = 1;
     int i = 0;
     jv keyset = jv_null();
@@ -326,14 +345,14 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
       }
 
       if (!first) {
-        if (flags & JV_PRINT_PRETTY){
-          put_str(",\n", F, S, flags & JV_PRINT_ISATTY);
-          put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
-        } else {
-          put_str(",", F, S, flags & JV_PRINT_ISATTY);
-        }
+        if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
+        put_char(',', F, S, flags & JV_PRINT_ISATTY);
       }
       if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);
+      if (flags & JV_PRINT_PRETTY) {
+        put_char('\n', F, S, flags & JV_PRINT_ISATTY);
+        put_indent(indent + 1, flags, F, S, flags & JV_PRINT_ISATTY);
+      }
 
       first = 0;
       if (color) put_str(FIELD_COLOR, F, S, flags & JV_PRINT_ISATTY);
@@ -342,11 +361,13 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
       if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);
 
       if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
-      put_str((flags & JV_PRINT_PRETTY) ? ": " : ":", F, S, flags & JV_PRINT_ISATTY);
+      put_char(':', F, S, flags & JV_PRINT_ISATTY);
       if (color) put_str(COLRESET, F, S, flags & JV_PRINT_ISATTY);
+      if (flags & JV_PRINT_PRETTY) {
+        put_char(' ', F, S, flags & JV_PRINT_ISATTY);
+      }
 
       jv_dump_term(C, value, flags, indent + 1, F, S);
-      if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);
     }
     if (flags & JV_PRINT_PRETTY) {
       put_char('\n', F, S, flags & JV_PRINT_ISATTY);
@@ -387,16 +408,17 @@ jv jv_dump_string(jv x, int flags) {
 }
 
 char *jv_dump_string_trunc(jv x, char *outbuf, size_t bufsize) {
-  x = jv_dump_string(x,0);
-  const char* p = jv_string_value(x);
-  const size_t len = strlen(p);
-  strncpy(outbuf, p, bufsize);
-  outbuf[bufsize - 1] = 0;
+  x = jv_dump_string(x, 0);
+  const char *str = jv_string_value(x);
+  const size_t len = strlen(str);
+  strncpy(outbuf, str, bufsize);
   if (len > bufsize - 1 && bufsize >= 4) {
-    // Indicate truncation with '...'
-    outbuf[bufsize - 2]='.';
-    outbuf[bufsize - 3]='.';
-    outbuf[bufsize - 4]='.';
+    // Indicate truncation with '...' without breaking UTF-8.
+    const char *s = jvp_utf8_backtrack(outbuf + bufsize - 4, outbuf, NULL);
+    if (s) bufsize = s + 4 - outbuf;
+    strcpy(outbuf + bufsize - 4, "...");
+  } else {
+    outbuf[bufsize - 1] = '\0';
   }
   jv_free(x);
   return outbuf;

package/deps/jq/src/jv_unicode.c

@@ -118,3 +118,21 @@ int jvp_utf8_encode(int codepoint, char* out) {
   assert(out - start == jvp_utf8_encode_length(codepoint));
   return out - start;
 }
+
+// characters with White_Space property in:
+// https://www.unicode.org/Public/UCD/latest/ucd/PropList.txt
+int jvp_codepoint_is_whitespace(int c) {
+  return
+    (c >= 0x0009 && c <= 0x000D) || // <control-0009>..<control-000D>
+    c == 0x0020                  || // SPACE
+    c == 0x0085                  || // <control-0085>
+    c == 0x00A0                  || // NO-BREAK SPACE
+    c == 0x1680                  || // OGHAM SPACE MARK
+    (c >= 0x2000 && c <= 0x200A) || // EN QUAD..HAIR SPACE
+    c == 0x2028                  || // LINE SEPARATOR
+    c == 0x2029                  || // PARAGRAPH SEPARATOR
+    c == 0x202F                  || // NARROW NO-BREAK SPACE
+    c == 0x205F                  || // MEDIUM MATHEMATICAL SPACE
+    c == 0x3000                     // IDEOGRAPHIC SPACE
+    ;
+}

package/deps/jq/src/jv_unicode.h

@@ -9,4 +9,6 @@ int jvp_utf8_decode_length(char startchar);
 
 int jvp_utf8_encode_length(int codepoint);
 int jvp_utf8_encode(int codepoint, char* out);
+
+int jvp_codepoint_is_whitespace(int c);
 #endif